Fix gpg-preset-passphrase bug.

Cleanups

44 files changed, 5965 insertions, 5924 deletions

diff --git a/NEWS b/NEWS
index 8108d5f49..7b46d9977 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,8 @@ Noteworthy changes in version 2.0.10 (unreleased)
 
  * gpgsm now uses AES by default.
 
+ * gpg-preset-passphrase works again.
+
 
 Noteworthy changes in version 2.0.9 (2008-03-26)
 ------------------------------------------------
diff --git a/THANKS b/THANKS
index 04626c0ba..947decee8 100644
--- a/THANKS
+++ b/THANKS
@@ -140,6 +140,7 @@ Kazuyoshi Kakihara
 Keith Clayton              keith at claytons.org
 Ken Takusagawa             ken.takusagawa.2  at gmail.com
 Kevin Ryde                 user42 at zip.com.au
+Kiss Gabor                 kissg at ssg.ki.iif.hu
 Klaus Singvogel            ks at caldera.de
 Kurt Garloff               garloff at suse.de
 Lars Kellogg-Stedman	   lars at bu.edu
diff --git a/TODO b/TODO
index 139b90d74..6f369dd39 100644
--- a/TODO
+++ b/TODO
@@ -104,6 +104,9 @@
    Remove these definitions.
 ** MY_GCRY_PK_ECDSA
    Remove this.
+** MY_GCRY_MD_SHA224
+   Remove this.
+
 
 * Extend selinux support to other modules
 
diff --git a/agent/ChangeLog b/agent/ChangeLog
index a60c85b71..0a5e6afb4 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-03  Werner Koch  <[email protected]>
+
+	* command.c (parse_keygrip): Use hex2bin.
+	(cmd_preset_passphrase): Decode the passphrase.  Reported by Kiss
+	Gabor.  Fixes #679 again.
+	* preset-passphrase.c (make_hexstring): Remove.
+	(preset_passphrase): Use bin2hex.
+
 2008-05-27  Werner Koch  <[email protected]>
 
 	* trustlist.c (insert_colons): Fix stupidly wrong allocation size
@@ -12,7 +20,7 @@
 
 	* gpg-agent.c (main, agent_deinit_default_ctrl): Always use xfree
 	because our asprintf is mapped to an xmalloc style function in
-	util.h. Replace xtrdup by xtrystrdup.
+	util.h. Replace xstrdup by xtrystrdup.
 	* w32main.c (build_argv): Ditto.
 	* preset-passphrase.c (preset_passphrase): Ditto.
 	* divert-scd.c (ask_for_card): Ditto.
diff --git a/agent/command.c b/agent/command.c
index 92e12e22c..c7853a92c 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -271,7 +271,6 @@ parse_keygrip (assuan_context_t ctx, const char *string, unsigned char *buf)
 {
   int rc;
   size_t n;
-  const unsigned char *p;
 
   rc = parse_hexstring (ctx, string, &n);
   if (rc)
@@ -280,8 +279,8 @@ parse_keygrip (assuan_context_t ctx, const char *string, unsigned char *buf)
   if (n != 20)
     return set_error (GPG_ERR_ASS_PARAMETER, "invalid length of keygrip");
 
-  for (p=(const unsigned char*)string, n=0; n < 20; p += 2, n++)
-    buf[n] = xtoi_2 (p);
+  if (hex2bin (string, buf, 20) < 0)
+    return set_error (GPG_ERR_BUG, "hex2bin");
 
   return 0;
 }
@@ -1100,7 +1099,7 @@ cmd_preset_passphrase (assuan_context_t ctx, char *line)
   size_t len;
 
   if (!opt.allow_preset_passphrase)
-    return gpg_error (GPG_ERR_NOT_SUPPORTED);
+    return set_error (GPG_ERR_NOT_SUPPORTED, "no --allow-preset-passphrase");
 
   rc = parse_keygrip (ctx, line, grip);
   if (rc)
@@ -1135,11 +1134,17 @@ cmd_preset_passphrase (assuan_context_t ctx, char *line)
   /* If there is a passphrase, use it.  Currently, a passphrase is
      required.  */
   if (*line)
-    passphrase = line;
+    {
+      /* Do in-place conversion.  */
+      passphrase = line;
+      if (!hex2str (passphrase, passphrase, strlen (passphrase)+1, NULL))
+        rc = set_error (GPG_ERR_ASS_PARAMETER, "invalid hexstring");
+    }
   else
-    return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+    rc = set_error (GPG_ERR_NOT_IMPLEMENTED, "passphrase is required");
 
-  rc = agent_put_cache (grip_clear, CACHE_MODE_ANY, passphrase, ttl);
+  if (!rc)
+    rc = agent_put_cache (grip_clear, CACHE_MODE_ANY, passphrase, ttl);
 
   if (rc)
     log_error ("command preset_passwd failed: %s\n", gpg_strerror (rc));
diff --git a/agent/preset-passphrase.c b/agent/preset-passphrase.c
index 42c7d6c95..cb906ad89 100644
--- a/agent/preset-passphrase.c
+++ b/agent/preset-passphrase.c
@@ -113,37 +113,6 @@ my_strusage (int level)
 /* Include the implementation of map_spwq_error.  */
 MAP_SPWQ_ERROR_IMPL
       
-/* Convert the string SRC into HEX encoding.  Caller needs to xfree
-   the returned string.  */
-static char *
-make_hexstring (const char *src)
-{
-  int len = 2 * strlen (src) + 1;
-  char *dst;
-  char *res;
-
-  res = dst = xtrymalloc (len);
-  if (!dst)
-    {
-      log_error ("can not escape string: %s\n",
-		 gpg_strerror (gpg_error_from_syserror ()));
-      return NULL;
-    }
-
-#define _tohex(nr)	((nr) < 10 ? ((nr) + '0') : (((nr) - 10) + 'A'))
-#define tohex1(p)  _tohex (*((unsigned char *) p) & 15)
-#define tohex2(p)  _tohex ((*((unsigned char *) p) >> 4) & 15)
-
-  while (*src)
-    {
-      *(dst++) = tohex2 (src);
-      *(dst++) = tohex1 (src);
-      src++;
-    }
-  *dst = '\0';
-  return res;
-}
-
 
 static void
 preset_passphrase (const char *keygrip)
@@ -175,11 +144,14 @@ preset_passphrase (const char *keygrip)
       /* FIXME: How to handle empty passwords?  */
     }
 
-  passphrase_esc = make_hexstring (opt_passphrase
-				   ? opt_passphrase : passphrase);
+  {
+    const char *s = opt_passphrase ? opt_passphrase : passphrase;
+    passphrase_esc = bin2hex (s, strlen (s), NULL);
+  }
   if (!passphrase_esc)
     {
-      /* Error message printed by callee.  */
+      log_error ("can not escape string: %s\n",
+		 gpg_strerror (gpg_error_from_syserror ()));
       return;
     }
 
diff --git a/common/ChangeLog b/common/ChangeLog
index 3842b9c68..e517872d2 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-03  Werner Koch  <[email protected]>
+
+	* convert.c (hex2str): New.
+	(hex2str_alloc): New.
+	* t-convert.c (test_hex2str): New.
+
 2008-08-19  Werner Koch  <[email protected]>
 
 	* iobuf.c: Avoid passing a NULL (iobuf_t)->desc to the log
diff --git a/common/convert.c b/common/convert.c
index 7aa6354d6..c946b81b1 100644
--- a/common/convert.c
+++ b/common/convert.c
@@ -1,5 +1,5 @@
 /* convert.c - Hex conversion functions.
- *	Copyright (C) 2006 Free Software Foundation, Inc.
+ *	Copyright (C) 2006, 2008 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -30,7 +30,7 @@
 
 /* Convert STRING consisting of hex characters into its binary
    representation and store that at BUFFER.  BUFFER needs to be of
-   LENGTH bytes.  The function check that the STRING will convert
+   LENGTH bytes.  The function checks that the STRING will convert
    exactly to LENGTH bytes. The string is delimited by either end of
    string or a white space character.  The function returns -1 on
    error or the length of the parsed string.  */
@@ -100,6 +100,7 @@ hexcolon2bin (const char *string, void *buffer, size_t length)
 }
 
 
+
 static char *
 do_bin2hex (const void *buffer, size_t length, char *stringbuf, int with_colon)
 {
@@ -160,3 +161,87 @@ bin2hexcolon (const void *buffer, size_t length, char *stringbuf)
 }
 
 
+
+/* Convert HEXSTRING consisting of hex characters into string and
+   store that at BUFFER.  HEXSTRING is either delimited by end of
+   string or a white space character.  The function makes sure that
+   the resulting string in BUFFER is terminated by a Nul character.
+   BUFSIZE is the availabe length of BUFFER; if the converted result
+   plus a possible required Nul character does not fit into this
+   buffer, the function returns NULL and won't change the existing
+   conent of buffer.  In-place conversion is possible as long as
+   BUFFER points to HEXSTRING.
+   
+   If BUFFER is NULL and bufsize is 0 the function scans HEXSTRING but
+   does not store anything.  This may be used to find the end of
+   hexstring.
+
+   On sucess the function returns a pointer to the next character
+   after HEXSTRING (which is either end-of-string or a the next white
+   space).  If BUFLEN is not NULL the strlen of buffer is stored
+   there; this will even be done if BUFFER has been passed as NULL. */
+const char *
+hex2str (const char *hexstring, char *buffer, size_t bufsize, size_t *buflen)
+{
+  const char *s = hexstring;
+  int idx, count;
+  int need_nul = 0;
+
+  if (buflen)
+    *buflen = 0;
+
+  for (s=hexstring, count=0; hexdigitp (s) && hexdigitp (s+1); s += 2, count++)
+    ;
+  if (*s && (!isascii (*s) || !isspace (*s)) )
+    return NULL;   /* Not followed by Nul or white space.  */
+  need_nul = !(s[-2] == '0' && s[-1] == '0');
+  if (need_nul)
+    count++;
+
+  if (buffer)
+    {
+      if (count > bufsize)
+        return NULL; /* Too long.  */
+      
+      for (s=hexstring, idx=0; hexdigitp (s) && hexdigitp (s+1); s += 2)
+        ((unsigned char*)buffer)[idx++] = xtoi_2 (s);
+      if (need_nul)
+        buffer[idx] = 0;
+    }
+
+  if (buflen)
+    *buflen = count - 1;
+  return s;
+}
+
+
+/* Same as hex2str but this function allocated a new string.  Returns
+   NULL on error.  If R_COUNT is not NULL, the number of scanned bytes
+   will be stored there.  ERRNO is set on error. */
+char *
+hex2str_alloc (const char *hexstring, size_t *r_count)
+{
+  const char *tail;
+  size_t nbytes;
+  char *result;
+
+  tail = hex2str (hexstring, NULL, 0, &nbytes);
+  if (!tail)
+    {
+      if (r_count)
+        *r_count = 0;
+      errno = EINVAL;
+      return NULL;
+    }
+  if (r_count)
+    *r_count = tail - hexstring;
+  result = xtrymalloc (nbytes+1);
+  if (!result)
+    return NULL;
+  if (!hex2str (hexstring, result, nbytes+1, NULL))
+    BUG ();
+  return result;
+}
+
+
+
diff --git a/common/t-convert.c b/common/t-convert.c
index ede1e463d..caf743f1f 100644
--- a/common/t-convert.c
+++ b/common/t-convert.c
@@ -1,5 +1,5 @@
 /* t-convert.c - Module test for convert.c
- *	Copyright (C) 2006 Free Software Foundation, Inc.
+ *	Copyright (C) 2006, 2008 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <assert.h>
 
 #include "util.h"
 
@@ -275,6 +276,173 @@ test_bin2hexcolon (void)
 
 
 
+static void
+test_hex2str (void)
+{
+  static struct {
+    const char *hex;
+    const char *str;
+    int off;
+    int no_alloc_test;
+  } tests[] = {
+    /* Simple tests.  */
+    { "112233445566778899aabbccddeeff1122",
+      "\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff\x11\x22",
+      34 },
+    { "112233445566778899aabbccddeeff1122 blah",
+      "\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff\x11\x22",
+      34 },
+    { "112233445566778899aabbccddeeff1122\tblah",
+      "\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff\x11\x22",
+      34 },
+    { "112233445566778899aabbccddeeff1122\nblah",
+      "\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff\x11\x22",
+      34 },
+    /* Valid tests yielding an empty string.  */
+    { "00",
+      "",
+      2 },
+    { "00 x",
+      "",
+      2 },
+    { "",
+      "",
+      0 },
+    { " ",
+      "",
+      0 },
+    /* Test trailing Nul feature.  */
+    { "112233445566778899aabbccddeeff112200",
+      "\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff\x11\x22",
+      36 },
+    { "112233445566778899aabbccddeeff112200 ",
+      "\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff\x11\x22",
+      36 },
+    /* Test buffer size. (buffer is of length 20)  */
+    { "6162636465666768696A6b6c6D6e6f70717273",
+      "abcdefghijklmnopqrs",
+      38 },
+    { "6162636465666768696A6b6c6D6e6f7071727300",
+      "abcdefghijklmnopqrs",
+      40 },
+    { "6162636465666768696A6b6c6D6e6f7071727374",
+      NULL,
+      0, 1 },
+    { "6162636465666768696A6b6c6D6e6f707172737400",
+      NULL,
+      0, 1 },
+    { "6162636465666768696A6b6c6D6e6f707172737475",
+      NULL,
+      0, 1 },
+
+    /* Invalid tests. */
+    { "112233445566778899aabbccddeeff1122334",      NULL, 0 },
+    { "112233445566778899AABBCCDDEEFF1122334",      NULL, 0 },
+    { "112233445566778899AABBCCDDEEFG11223344",     NULL, 0 },
+    { "0:0112233445566778899aabbccddeeff11223344",  NULL, 0 },
+    { "112233445566778899aabbccddeeff11223344:",    NULL, 0 },
+    { "112233445566778899aabbccddeeff112233445",    NULL, 0 },
+    { "112233445566778899aabbccddeeff1122334455",   NULL, 0, 1 },
+    { "112233445566778899aabbccddeeff11223344blah", NULL, 0 },
+    { "0",    NULL, 0 },
+    { "00:",  NULL, 0 },
+    { "00x",  NULL, 0 },
+
+    { NULL, NULL, 0 }
+  };
+
+  int idx;
+  char buffer[20];
+  const char *tail;
+  size_t count;
+  char *result;
+
+  for (idx=0; tests[idx].hex; idx++)
+    {
+      tail = hex2str (tests[idx].hex, buffer, sizeof buffer, &count);
+      if (tests[idx].str)
+        {
+          /* Good case test.  */
+          if (!tail)
+            fail (idx);
+          else if (strcmp (tests[idx].str, buffer))
+            fail (idx);
+          else if (tail - tests[idx].hex != tests[idx].off)
+            fail (idx);
+          else if (strlen (buffer) != count)
+            fail (idx);
+        }
+      else
+        {
+          /* Bad case test.  */
+          if (tail)
+            fail (idx);
+        }
+    }
+
+  /* Same tests again using in-place conversion.  */
+  for (idx=0; tests[idx].hex; idx++)
+    {
+      char tmpbuf[100];
+      
+      assert (strlen (tests[idx].hex)+1 < sizeof tmpbuf);
+      strcpy (tmpbuf, tests[idx].hex);
+      
+      /* Note: we still need to use 20 as buffer length because our
+         tests assume that. */
+      tail = hex2str (tmpbuf, tmpbuf, 20, &count);
+      if (tests[idx].str)
+        {
+          /* Good case test.  */
+          if (!tail)
+            fail (idx);
+          else if (strcmp (tests[idx].str, tmpbuf))
+            fail (idx);
+          else if (tail - tmpbuf != tests[idx].off)
+            fail (idx);
+          else if (strlen (tmpbuf) != count)
+            fail (idx);
+        }
+      else
+        {
+          /* Bad case test.  */
+          if (tail)
+            fail (idx);
+          if (strcmp (tmpbuf, tests[idx].hex))
+            fail (idx); /* Buffer was modified.  */
+        }
+    }
+
+  /* Test the allocation variant.  */
+  for (idx=0; tests[idx].hex; idx++)
+    {
+      if (tests[idx].no_alloc_test)
+        continue;
+
+      result = hex2str_alloc (tests[idx].hex, &count);
+      if (tests[idx].str)
+        {
+          /* Good case test.  */
+          if (!result)
+            fail (idx);
+          else if (strcmp (tests[idx].str, result))
+            fail (idx);
+          else if (count != tests[idx].off)
+            fail (idx);
+        }
+      else
+        {
+          /* Bad case test.  */
+          if (result)
+            fail (idx);
+        }
+      xfree (result);
+    }
+}
+
+
+
+
 
 int
 main (int argc, char **argv)
@@ -284,6 +452,7 @@ main (int argc, char **argv)
   test_hexcolon2bin ();
   test_bin2hex ();
   test_bin2hexcolon ();
+  test_hex2str ();
 
   return 0;
 }
diff --git a/common/util.h b/common/util.h
index 5b564a2c6..572fa1a6a 100644
--- a/common/util.h
+++ b/common/util.h
@@ -189,6 +189,9 @@ int hex2bin (const char *string, void *buffer, size_t length);
 int hexcolon2bin (const char *string, void *buffer, size_t length);
 char *bin2hex (const void *buffer, size_t length, char *stringbuf);
 char *bin2hexcolon (const void *buffer, size_t length, char *stringbuf);
+const char *hex2str (const char *hexstring,
+                     char *buffer, size_t bufsize, size_t *buflen);
+char *hex2str_alloc (const char *hexstring, size_t *r_count);
 
 
 /*-- homedir.c --*/
diff --git a/doc/ChangeLog b/doc/ChangeLog
index f68283bac..150b3450b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-30  Werner Koch  <[email protected]>
+
+	* yat2m.c (write_th): Print a not ethat this is generated source.
+	(VERSION): Bump up to 1.0.
+
 2008-07-30  Werner Koch  <[email protected]>
 
 	* gpgsm.texi (GPGSM Configuration): Mention com-cert.pem.
diff --git a/doc/yat2m.c b/doc/yat2m.c
index 34e489a01..a936fefa9 100644
--- a/doc/yat2m.c
+++ b/doc/yat2m.c
@@ -1,6 +1,6 @@
 /* yat2m.c - Yet Another Texi 2 Man converter
  *	Copyright (C) 2005 g10 Code GmbH
- *      Copyright (C) 2006 2006 Free Software Foundation, Inc.
+ *      Copyright (C) 2006, 2008 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -87,7 +87,7 @@
 
 
 #define PGM "yat2m"
-#define VERSION "0.5"
+#define VERSION "1.0"
 
 /* The maximum length of a line including the linefeed and one extra
    character. */
@@ -414,6 +414,8 @@ write_th (FILE *fp)
 {
   char *name, *p;
 
+  fputs (".\\\" Created from Texinfo source by yat2m " VERSION "\n", fp);
+
   name = ascii_strupr (xstrdup (thepage.name));
   p = strrchr (name, '.');
   if (!p || !p[1])
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index be11f7de5..05919363c 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-29  Werner Koch  <[email protected]>
+
+	* gpgkeys_kdns.c: Changed copyright notice to the FSF.
+
 2008-04-21  Werner Koch  <[email protected]>
 
 	* ksutil.c (w32_init_sockets) [HAVE_W32_SYSTEM]: New.
diff --git a/keyserver/gpgkeys_kdns.c b/keyserver/gpgkeys_kdns.c
index b32b0744f..5979b0668 100644
--- a/keyserver/gpgkeys_kdns.c
+++ b/keyserver/gpgkeys_kdns.c
@@ -1,5 +1,5 @@
 /* gpgkeys_kdns.c - Fetch a key via the GnuPG specific KDNS scheme.
- * Copyright (C) 2008 g10 Code GmbH
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff --git a/po/be.po b/po/be.po
index 2e789f392..37876abb5 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
 "Language-Team: Belarusian <[email protected]>\n"
@@ -91,8 +91,8 @@ msgstr "дрэнны пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -102,10 +102,10 @@ msgstr ""
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1095,7 +1095,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
@@ -3235,20 +3235,20 @@ msgstr "збой падпісаньня: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "Ключ абаронены.\n"
 
@@ -3265,7 +3265,7 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
@@ -4022,12 +4022,12 @@ msgid "writing key binding signature\n"
 msgstr ""
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
@@ -4166,7 +4166,7 @@ msgstr ""
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4176,7 +4176,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4186,55 +4186,55 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 msgid "Signature does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4244,44 +4244,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4289,7 +4289,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4304,34 +4304,34 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4339,7 +4339,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4347,91 +4347,91 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 msgid "Really create? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -5840,12 +5840,12 @@ msgstr "памылка чытаньня файла"
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -5889,82 +5889,82 @@ msgstr ""
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
@@ -6308,12 +6308,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6325,98 +6325,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "Паўтарыце пароль\n"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "Паўтарыце пароль\n"
@@ -6424,102 +6429,102 @@ msgstr "Паўтарыце пароль\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 msgid "error reading application data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 #, fuzzy
 msgid "key already exists\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 #, fuzzy
 msgid "generating new key\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -7476,7 +7481,7 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 msgid "error storing flags: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -7788,12 +7793,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 021a4530a..3ce2f2e19 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -113,8 +113,8 @@ msgstr "la contrasenya és errònia"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -124,10 +124,10 @@ msgstr "no s'ha pogut crear «%s»: %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1165,7 +1165,7 @@ msgstr ""
 # Destès? ivb
 # Desatès, sí. jm
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "no es pot fet això en mode desatès\n"
@@ -3442,20 +3442,20 @@ msgstr "Ha fallat el procés de signatura: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no està protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "La clau està protegida.\n"
 
@@ -3472,7 +3472,7 @@ msgstr ""
 "Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
@@ -4304,12 +4304,12 @@ msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
@@ -4449,7 +4449,7 @@ msgstr "La grandària sol·licitada és %u bits\n"
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4465,7 +4465,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4481,42 +4481,42 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
 # Amb «it» es refereix a les dates?  ivb
 # Això vaig entendre jo. jm
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4524,19 +4524,19 @@ msgstr ""
 "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
 "Tanmateix, les tractarà bé fins l'any 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 #, fuzzy
 msgid ""
 "\n"
@@ -4553,44 +4553,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot començar amb un dígit\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Esteu usant el joc de caràcters `%s'.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4601,7 +4601,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 
@@ -4618,23 +4618,23 @@ msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4642,12 +4642,12 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4659,7 +4659,7 @@ msgstr ""
 "useu aquest programa amb l'opció \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4671,53 +4671,53 @@ msgstr ""
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'està escrivint la clau pública a «%s»\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # Potser no hi haja cap anell! ivb
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "s'han creat i signat les claus pública i secreta.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4726,13 +4726,13 @@ msgstr ""
 "Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n"
 "\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4741,7 +4741,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4749,26 +4749,26 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -6293,12 +6293,12 @@ msgstr "error de lectura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "reg de la base de dades de confiança %lu: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -6345,82 +6345,82 @@ msgstr "%s: s'ha creat una base de dades de confiança invàlida\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: s'ha creat la base de dades de confiança\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: no es pot escriure en la base de dades de confiança\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: la base de dades de confiança és invàlida\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error en actualitzar el registre de la versió: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error en llegir el registre de la versió: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error en escriure el registre de la versió: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dades de confiança: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s no és un fitxer de base de dades de confiança\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registre de versió amb número de registre %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: la versió de fitxer %d és invàlida\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: no s'ha pogut posar a zero un registre: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: no s'ha pogut afegir un registre: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "la base de dades de confiança està corrompuda; per favor, executeu «gpg --fix-"
@@ -6780,12 +6780,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6797,98 +6797,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "canvia la contrasenya"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "canvia la contrasenya"
@@ -6896,103 +6901,103 @@ msgstr "canvia la contrasenya"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 #, fuzzy
 msgid "key already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -7986,7 +7991,7 @@ msgstr "error en crear «%s»: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -8302,12 +8307,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index 6e99d8db1..84c74cb18 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -94,8 +94,8 @@ msgstr "�patn� heslo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -105,10 +105,10 @@ msgstr "nemohu vytvo�it `%s': %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1117,7 +1117,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta ��slo %s\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
@@ -3313,19 +3313,19 @@ msgstr ""
 "K dispozici je jen kontroln� sou�et kl��e nebo je kl�� na kart� - passphrase "
 "nelze zm�nit.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� ��st prim�rn�ho kl��e jsou ulo�eny na kart�.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
@@ -3342,7 +3342,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
@@ -4099,12 +4099,12 @@ msgid "writing key binding signature\n"
 msgstr "zapisuji \"key-binding\" podpis\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�lka kl��e; pou�iji %u bit�\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
@@ -4242,7 +4242,7 @@ msgstr "Po�adovan� d�lka kl��e je %u bit�.\n"
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bit�\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4258,7 +4258,7 @@ msgstr ""
 "      <n>m = doba platnosti kl��e skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti kl��e skon�� za n let\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4274,38 +4274,38 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti podpisu skon�� za n let\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "Kl�� je platn� pro? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� pro? (%s) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 msgid "Key does not expire at all\n"
 msgstr "Platnost kl��e nikdy neskon��\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 msgid "Signature does not expire at all\n"
 msgstr "Platnost podpisu nikdy neskon��\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Platnost kl��e skon�� v %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnost podpisu skon�� v %s\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4313,18 +4313,18 @@ msgstr ""
 "V� syst�m neum� zobrazit data po roce 2038.\n"
 "V ka�d�m p��pad� budou data korektn� zpracov�v�na do roku 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vn� (a/N)? "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4340,44 +4340,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Jm�no a p��jmen�: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Jm�no nem��e za��nat ��slic�\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Koment��: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment��i\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��v�te znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4388,7 +4388,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
 
@@ -4403,25 +4403,25 @@ msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zm�nit (J)m�no, (K)oment��, (E)-mail nebo (U)kon�it? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zm�nit (J)m�no, (K)oment��, (E)-mail, (P)okra�ovat d�l nebo (U)kon�it "
 "program? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4429,12 +4429,12 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4446,7 +4446,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4459,50 +4459,50 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru ve�ejn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru tajn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "ve�ejn� a tajn� kl�� byly vytvo�eny a podeps�ny.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4510,12 +4510,12 @@ msgstr ""
 "Tento kl�� nem��e b�t pou�it� pro �ifrov�n�. K vytvo�en�\n"
 "sekund�rn�ho kl��e pro tento ��el m��ete pou��t p��kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4523,7 +4523,7 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4531,25 +4531,25 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvo�en� podkl��e pro kl��e v3 nen� v souladu s OpenPGP\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvo�it? (a/N) "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "ulo�en� kl��e na kartu se nezda�ilo: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: z�loha kl��e z karty ulo�ena do `%s'\n"
@@ -6004,12 +6004,12 @@ msgstr "chyba p�i �ten� v `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�ze d�v�ry: synchronizace selhala %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "z�znam v datab�zi d�v�ry %lu: lseek() se nepoda�il: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "z�znam v datab�zi d�v�ry %lu: z�pis se nepoda�il (n=%d): %s\n"
@@ -6053,82 +6053,82 @@ msgstr "%s: vytvo�ena neplatn� datab�ze d�v�ry\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: datab�ze d�v�ry vytvo�ena\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "POZN�MKA: do trustedb nezle zapisovat\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatn� datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepoda�ilo se vytvo�it hashovac� tabulku: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba p�i aktualizaci z�znamu verze: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba p�i �ten� z�znamu verze: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba p�i z�pisu z�znamu verze: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "datab�ze d�v�ry: procedura lseek() selhala: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "datab�ze d�v�ry: procedura read() (n=%d) selhala: %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nen� soubor datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: z�znam verze s ��slem %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatn� verze souboru %d\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: chyba p�i �ten� voln�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: chyba p�i z�pisu adres��ov�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulov�n� z�znamu selhalo: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: p�id�n� z�znamu selhalo: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "datab�ze d�v�ry je po�kozena; pros�m spus�te \"gpg --fix-trustdb\".\n"
 
@@ -6479,12 +6479,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback zkon�ila chybou: %s\n"
@@ -6496,99 +6496,104 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr "|N|Nov� PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ulo�en� datumu vytvo�en� se nezda�ilo: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr "odpov�� neobsahuje ve�ejn� kl��\n"
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpov�� neobsahuje RSA modulus\n"
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN pro CHV%d je p��li� kr�tk�; minim�ln� d�lka je %d\n"
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifikace CHV%d se nezda�ila: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr "p��stup k administr�torsk�m p��kaz�m nen� nakonfigurov�n\n"
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba p�i z�sk�n� CHV z karty\n"
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "Do trval�ho uzam�en� karty z�st�v� %d pokus� o zad�n� PINu administr�tora\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
@@ -6596,100 +6601,100 @@ msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr "|A|PIN administr�tora"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nov� PIN administr�tora"
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 msgid "error reading application data\n"
 msgstr "chyba p�i �ten� aplika�n�ch dat\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 msgid "error reading fingerprint DO\n"
 msgstr "chyba p�i �ten� fingerpritnu DO\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 msgid "key already exists\n"
 msgstr "kl�� ji� existuje\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr "existuj�c� kl�� bude p�eps�n\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 msgid "generating new key\n"
 msgstr "generov�n� nov�ho kl��e\n"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr "chyb� �asov� raz�tko vytvo�en�\n"
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "sch�z� RSA modulus nebo nem� velikost %d bit�\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "sch�z� ve�ejn� RSA exponent nebo je del�� ne� %d bit�\n"
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "sch�z� RSA prime %s nebo nem� velikost %d bit�\n"
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr "pros�m po�kejte ne� bude kl�� vygenerov�n ...\n"
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 msgid "generating key failed\n"
 msgstr "henerov�n� kl��e se nezda�ilo\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generov�n� kl��e dokon�eno (%d sekund)\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "neplatn� struktura OpenPGP kraty (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvo�en� podpisy: %lu\n"
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "ov��en� administr�torsk�ho PIN je nyn� prost�ednictv�m tohoto p��kazu "
 "zak�z�no\n"
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
@@ -7662,7 +7667,7 @@ msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -7975,12 +7980,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index e3878f480..cdb42aff7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -92,8 +92,8 @@ msgstr "d�rlig kodes�tning"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, fuzzy, c-format
@@ -103,10 +103,10 @@ msgstr "kan ikke oprette %s: %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1105,7 +1105,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
@@ -3290,21 +3290,21 @@ msgstr "signering fejlede: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
@@ -3319,7 +3319,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
@@ -4115,12 +4115,12 @@ msgid "writing key binding signature\n"
 msgstr ""
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
@@ -4260,7 +4260,7 @@ msgstr "�nsket n�glest�rrelse er %u bit\n"
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4270,7 +4270,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4280,59 +4280,59 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
 # virker j automatisk istedetfor y?
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4342,44 +4342,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4390,7 +4390,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4405,24 +4405,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4430,12 +4430,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4443,7 +4443,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4451,92 +4451,92 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "hemmelige n�gler import: %lu\n"
@@ -5989,12 +5989,12 @@ msgstr "panser: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -6038,82 +6038,82 @@ msgstr ""
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
@@ -6458,12 +6458,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6475,99 +6475,104 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
 # er det klogt at overs�tte TrustDB?
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "�ndr kodes�tningen"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "�ndr kodes�tningen"
@@ -6575,104 +6580,104 @@ msgstr "�ndr kodes�tningen"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "fejl i trailerlinie\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 #, fuzzy
 msgid "key already exists\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gener�r et nyt n�glepar"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
@@ -7638,7 +7643,7 @@ msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -7953,12 +7958,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index b225e17bc..71a1de48f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2008-06-27 14:10+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -96,8 +96,8 @@ msgstr "Passphrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -107,10 +107,10 @@ msgstr "'%s' kann nicht erzeugt werden: %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1109,7 +1109,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP Karte Nr. %s erkannt\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
 
@@ -3326,19 +3326,19 @@ msgstr ""
 "Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- "
 "keine Passphrase ist zu ändern.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Dieser Schlüssel ist nicht geschützt.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschlüssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Geheime Teile des Haupschlüssels sind auf der Karte gespeichert.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "Schlüssel ist geschützt.\n"
 
@@ -3355,7 +3355,7 @@ msgstr ""
 "Geben Sie die neue Passphrase für diesen geheimen Schlüssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
@@ -4128,12 +4128,12 @@ msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
@@ -4273,7 +4273,7 @@ msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4289,7 +4289,7 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4305,38 +4305,38 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 msgid "Key does not expire at all\n"
 msgstr "Schlüssel verfällt nie\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 msgid "Signature does not expire at all\n"
 msgstr "Signature verfällt nie\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key verfällt am %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Unterschrift verfällt am %s\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4344,11 +4344,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 msgid "Is this correct? (y/N) "
 msgstr "Ist dies richtig? (j/N) "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4358,7 +4358,7 @@ msgstr ""
 "GnuPG erstellt eine User-ID um Ihren Schlüssel identifizierbar zu machen.\n"
 "\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4374,44 +4374,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Email-Adresse: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Diese Email-Adresse ist ungültig\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4422,7 +4422,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
 
@@ -4437,23 +4437,23 @@ msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (B)eenden? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4461,12 +4461,12 @@ msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4479,7 +4479,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4490,50 +4490,50 @@ msgstr ""
 "unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
 "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "schreiben des geheimen Schlüssel-\"stub\"s nach `%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4542,12 +4542,12 @@ msgstr ""
 "werden kann.  Sie können aber mit dem Befehl \"--edit-key\" einen\n"
 "Unterschlüssel für diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4555,7 +4555,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4563,25 +4563,25 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HINWEIS: Unterschlüssel für v3-Schlüssen sind nicht OpenPGP-konform\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? (j/N) "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "Speicher des Schlüssels auf der Karte schlug fehl: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
@@ -6077,12 +6077,12 @@ msgstr "Lesefehler in `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
@@ -6126,82 +6126,82 @@ msgstr "%s: ungültige trust-db erzeugt\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: trust-db erzeugt\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "Notiz: Die \"trustdb\" ist nicht schreibbar\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ungültige 'Trust'-Datenbank\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Fehler beim Ändern des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: keine trustdb Datei\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anhängen: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpg --fix-trustdb"
@@ -6551,12 +6551,12 @@ msgstr ""
 "Syntax: kbxutil [Optionen] [Dateien]\n"
 "Anlistem exportieren und Importieren von KeyBox Dateien\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||Bitte die PIN auf der Tastatur des Kartenleser eingeben"
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Callback meldete Fehler: %s\n"
@@ -6568,95 +6568,100 @@ msgstr "Die Nullpin wurde noch nicht geändert\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr "|N|Neue PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n"
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "Die Standard PIN wird für %s benutzt\n"
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "Die Standard PIN für %s konnte nicht benutzt werden: %s - Die Standard PIN "
 "wird nicht weiter benutzt\n"
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 "||Bitte die PIN auf der Tastatur des Kartenleser eingeben%%0A[Sigs erzeugt: %"
 "lu]"
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft gesperrt ist\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
@@ -6665,107 +6670,107 @@ msgstr ""
 "|A|Bitte die Admin-PIN auf der Tastatur des Kartenleser eingeben%%0A"
 "[Verbliebene Versuche: %d]"
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "|A|Bitte die Admin-PIN auf der Tastatur des Kartenleser eingeben"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr "|A|Admin-PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Neue Admin-PIN"
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 msgid "error reading application data\n"
 msgstr "Fehler beim Lesen der Anwendungsdaten\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 msgid "error reading fingerprint DO\n"
 msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 msgid "key already exists\n"
 msgstr "Schlüssel existiert bereits\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr "Existierender Schlüssel wird ersetzt werden\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 msgid "generating new key\n"
 msgstr "neue Schlüssel werden erzeugt\n"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr "Erzeugungsdatum fehlt\n"
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Der RSA Modulus fehlt oder ist nicht %d Bits lang\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "der öffentliche Exponent fehlt oder ist zu groß (mehr als %d Bit)\n"
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Die RSA Primzahl %s fehlt oder ist nicht %d Bits lang\n"
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 msgid "generating key failed\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)}\n"
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr "Der Fingerabdruck auf der Karte entspricht nicht dem angeforderten.\n"
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "Die Überprüfung der Admin PIN is momentan durch einen Befehl verboten "
 "worden\n"
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@ -7702,7 +7707,7 @@ msgstr "Fehler beim Holen der gespeicherten Flags: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "Fehler beim Speichern der Flags: %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr "Fehler - "
 
@@ -7979,7 +7984,9 @@ msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
 
 #: tools/gpgconf-comp.c:693
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|MECHANISMEN|Benutze MECHANISMEN um Schlüssel über die Mailadresse aufzufinden."
+msgstr ""
+"|MECHANISMEN|Benutze MECHANISMEN um Schlüssel über die Mailadresse "
+"aufzufinden."
 
 #: tools/gpgconf-comp.c:738
 msgid "disable all access to the dirmngr"
@@ -8021,12 +8028,12 @@ msgstr "Liste der LDAP Server"
 msgid "Configuration for OCSP"
 msgstr "Konfiguration zu OCSP"
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Die externe Überprüfung der Komponente %s war nicht erfolgreich"
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 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 2f4104854..c81e0a333 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -92,8 +92,8 @@ msgstr "���� ����� ������"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -103,10 +103,10 @@ msgstr "�������� ����������� ��� `%s': %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1117,7 +1117,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
@@ -3378,20 +3378,20 @@ msgstr "� �������� �������: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
@@ -3408,7 +3408,7 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
@@ -4220,12 +4220,12 @@ msgid "writing key binding signature\n"
 msgstr "������� ��������� \"�������\" ��������\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�� ������ ������� ��������, ����� %u bits\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
@@ -4365,7 +4365,7 @@ msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
 msgid "rounded up to %u bits\n"
 msgstr "����������������� ��� �� %u bits\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4381,7 +4381,7 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4397,40 +4397,40 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "� �������� ����� ������ ���; (0) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "�� ������ ����\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "�� %s ����� ���� %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4438,19 +4438,19 @@ msgstr ""
 "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
 "����, �� ����������� ����� ��� �� 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "����� ���� ����� (y/n); "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 #, fuzzy
 msgid ""
 "\n"
@@ -4467,44 +4467,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "������� �����: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "��������� Email: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "�� ������� ���������� ��� ������\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�������������� �� `%s' ��� ����������.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4515,7 +4515,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
@@ -4530,23 +4530,23 @@ msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4554,12 +4554,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4571,7 +4571,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4583,50 +4583,50 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4637,12 +4637,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4650,7 +4650,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4658,28 +4658,28 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "������� �� ������������; "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
@@ -6176,12 +6176,12 @@ msgstr "������ ���������: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync �������: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: �������� lseek: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: �������� write (n=%d): %s\n"
@@ -6225,82 +6225,82 @@ msgstr "%s: ������������� �� ������ trustdb\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: ������������� � trustdb\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "��������: � trustdb ��� ����� ���������\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: �� ������ trustdb\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �������� ����������� hashtable: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ������ ���� ��������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: ������� lseek: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ��� ����� trustdb ������\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: ������� ������� �� recnum %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: �� ������ ������ ������� %d\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �������� ���� ��������� ���� ��������: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �������� ���� �������� ���� ��������: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "� trustdb ����� �������� - ��������������� �� \"gpg --fix-trustdb\".\n"
 
@@ -6652,12 +6652,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6669,98 +6669,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "������ ��� ������ ������"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "������ ��� ������ ������"
@@ -6768,103 +6773,103 @@ msgstr "������ ��� ������ ������"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' ��� �����������\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 #, fuzzy
 msgid "generating new key\n"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
@@ -7831,7 +7836,7 @@ msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -8147,12 +8152,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/eo.po b/po/eo.po
index 3777a9851..d2480ff23 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -92,8 +92,8 @@ msgstr "malbona pasfrazo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -103,10 +103,10 @@ msgstr "ne povas krei '%s': %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1124,7 +1124,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
@@ -3366,20 +3366,20 @@ msgstr "subskribado malsukcesis: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
@@ -3396,7 +3396,7 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
@@ -4199,12 +4199,12 @@ msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
@@ -4344,7 +4344,7 @@ msgstr "Petita �losilgrando estas %u bitoj\n"
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4360,7 +4360,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4376,40 +4376,40 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�losilo validu por ...? (0) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4417,19 +4417,19 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 #, fuzzy
 msgid ""
 "\n"
@@ -4445,44 +4445,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4493,7 +4493,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 
@@ -4508,23 +4508,23 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (F)ini? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4532,12 +4532,12 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4549,7 +4549,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4561,50 +4561,50 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4613,12 +4613,12 @@ msgstr ""
 "Notu, ke �i tiu �losilo ne estas uzebla por �ifrado. Vi eble volos\n"
 "uzi la komandon \"--edit-key\" por krei flankan �losilon por tiu celo.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4626,7 +4626,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4634,26 +4634,26 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTO: krei sub�losilojn por v3-�losiloj ne estas OpenPGP-kongrue\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�u vere krei? "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
@@ -6133,12 +6133,12 @@ msgstr "kiraso: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
@@ -6182,82 +6182,82 @@ msgstr "%s: nevalida fido-datenaro kreita\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: fido-datenaro kreita\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: nevalida fido-datenaro\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eraro dum aktualigo de versiregistro: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eraro dum skribado de versiregistro: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "fido-datenaro: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiregistro kun registronumero %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: malsukcesis nuligi registron: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: malsukcesis aldoni registron: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la fido-datenaro estas fu�ita; bonvolu ruli \"gpg --fix-trustdb\".\n"
 
@@ -6606,12 +6606,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6623,98 +6623,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "�an�i la pasfrazon"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "�an�i la pasfrazon"
@@ -6722,103 +6727,103 @@ msgstr "�an�i la pasfrazon"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 #, fuzzy
 msgid "key already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 #, fuzzy
 msgid "generating new key\n"
 msgstr "krei novan �losilparon"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@ -7799,7 +7804,7 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -8113,12 +8118,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 16633aaf5..04ba7be7d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2008-05-27 22:38+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -111,8 +111,8 @@ msgstr "Frase contrase�a"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "no pueden usarse claves ssh de m�s de %d bits\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -122,10 +122,10 @@ msgstr "no se puede crear %s: %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1125,7 +1125,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
@@ -3299,19 +3299,19 @@ msgstr ""
 "La clave tiene s�lo un apuntador u objetos de clave en la propia tarjeta\n"
 "- no hay frase contrase�a que cambiar.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
@@ -3328,7 +3328,7 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
@@ -4078,12 +4078,12 @@ msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
@@ -4223,7 +4223,7 @@ msgstr "El tama�o requerido es de %u bits\n"
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4239,7 +4239,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4255,38 +4255,38 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Clave v�lida �durante? (%s) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 msgid "Signature does not expire at all\n"
 msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4294,18 +4294,18 @@ msgstr ""
 "Su sistema no puede mostrar fechas m�s all� del 2038.\n"
 "Sin embargo funcionar� correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 msgid "Is this correct? (y/N) "
 msgstr "�Es correcto? (s/n) "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4321,44 +4321,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4369,7 +4369,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor no ponga la direcci�n de correo-e en el nombre real o en el "
@@ -4386,23 +4386,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (S)alir? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4410,12 +4410,12 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4427,7 +4427,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4440,50 +4440,50 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escribiendo apuntador de la clave privada en `%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4491,12 +4491,12 @@ msgstr ""
 "Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
 "la orden \"--edit-key\" para crear una subclave con este prop�sito.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4504,7 +4504,7 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4512,25 +4512,25 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaves para claves V3 no sigue el est�ndar OpenPGP\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 msgid "Really create? (y/N) "
 msgstr "�Crear de verdad? (s/N) "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "almacenado de clave en la tarjeta fallido: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no se puede crear fichero de respaldo `%s': %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
@@ -5987,12 +5987,12 @@ msgstr "error de lectura `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -6037,82 +6037,82 @@ msgstr "%s: se ha creado base de datos de confianza inv�lida\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: no se puede escribir base de datos de confianza\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza inv�lida\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versi�n: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error leyendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error escribiendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: fallo lseek: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de versi�n con n�mero de registro %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n del fichero %d inv�lida\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error leyendo registro libre: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error escribiendo registro de directorio: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: fallo en poner a cero un registro: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al a�adir un registro: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
@@ -6462,12 +6462,12 @@ msgstr ""
 "Sintaxis: kbxutil [opciones] [ficheros]\n"
 "listar, exportar, importar datos Keybox\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||Por favor inntroduzca su PIN en el teclado del lector"
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
@@ -6479,93 +6479,98 @@ msgstr "el PIN-Nulo no ha sido cambiado\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr "|N|Nuevo PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo guardando la fecha de creaci�n: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallo leyendo clave p�blica: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr "la respuesta no incluye la clave p�blica\n"
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr "la respuesta no incluye el m�dulo RSA\n"
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la respuesta no incluye el exponente p�blico RSA\n"
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Introduzca su PIN en el teclado del lector%%OA[firmas hechas: %lu]"
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Por favor introduzca PIN%%0A[firmas hechas: %lu]"
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Por favor introduzca PIN%%0A[firmas hechas: %lu]"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "El PIN para CHV%d es demasiado corto; longitud m�nima %d\n"
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificaci�n CHV%d fall�: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr "el acceso a �rdenes de administrador no est� configurado\n"
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr "�la tarjeta est� bloqueada permanentemente!\n"
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "%d intentos quedan para PIN de administrador antes de "
 "bloquearpermanentemente la clave\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
@@ -6574,106 +6579,106 @@ msgstr ""
 "|A|Introduzca PIN de Administrador en el teclado del lector%%0A[intentos "
 "restantes %d]"
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "|A|Introduzca PIN de Administrador en el teclado del lector"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr "|A|PIN Administrador"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuevo PIN Administrador"
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 msgid "error reading application data\n"
 msgstr "error leyendo datos de la aplicaci�n\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 msgid "error reading fingerprint DO\n"
 msgstr "error leyendo huella digital DO\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 msgid "key already exists\n"
 msgstr "la clave ya existe\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr "la clave existente ser� reemplazada\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 msgid "generating new key\n"
 msgstr "generando nueva clave\n"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr "falta fecha de creaci�n\n"
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "falta el m�dulo RSA o no es de %d bits\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "falta el exponente p�blico RSA o es mayor de %d bits\n"
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "el primo RSA %s falta o no es de %d bits\n"
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr "por favor, espere mientras se genera la clave ...\n"
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 msgid "generating key failed\n"
 msgstr "la generaci�n de la clave fall�\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generaci�n de clave completada (%d segundos)\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "estructura de la tarjeta OpenPGP inv�lida (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr "la huella digital en la tarjeta no coincide con la solicitada\n"
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "actualmente se prohibe verificar el PIN del Administrador con esta orden\n"
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
@@ -7597,7 +7602,7 @@ msgstr "error obteniendo par�metros almacenados: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "error almacenando par�metros: %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 #, fuzzy
 msgid "Error - "
 msgstr "[Error - Sin nombre]"
@@ -7911,12 +7916,12 @@ msgstr "lista de servidores LDAP"
 msgid "Configuration for OCSP"
 msgstr "Configuraci�n de OCSP"
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr "Note que las especificaci�n de grupo se ignoran\n"
 
diff --git a/po/et.po b/po/et.po
index 9ba93498a..ac2606e35 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -92,8 +92,8 @@ msgstr "halb parool"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -103,10 +103,10 @@ msgstr "`%s' ei �nnestu luua: %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1115,7 +1115,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
@@ -3348,20 +3348,20 @@ msgstr "allkirjastamine eba�nnestus: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
@@ -3378,7 +3378,7 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
@@ -4177,12 +4177,12 @@ msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
@@ -4322,7 +4322,7 @@ msgstr "Soovitud v�tmepikkus on %u bitti\n"
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4338,7 +4338,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4354,40 +4354,40 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4395,19 +4395,19 @@ msgstr ""
 "Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
 "Siiski k�sitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 #, fuzzy
 msgid ""
 "\n"
@@ -4423,44 +4423,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4471,7 +4471,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 
@@ -4486,23 +4486,23 @@ msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4510,12 +4510,12 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4527,7 +4527,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4539,50 +4539,50 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4592,43 +4592,43 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "M�RKUS: v3 v�tmetele alamv�tmete loomine ei ole OpenPGP �hilduv\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon t�esti? "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
@@ -6100,12 +6100,12 @@ msgstr "viga lugemisel: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync eba�nnestus: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -6149,82 +6149,82 @@ msgstr "%s: loodi vigane usalduse andmebaas\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb on loodud\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "M�RKUS: trustdb pole kirjutatav\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: vigane trustdb\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: viga versioonikirje uuendamisel: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: viga versioonikirje lugemisel: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb fail\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versioonikirje kirje numbriga %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vigane faili versioon %d\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kirje nullimine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kirje lisamine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
 
@@ -6573,12 +6573,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6590,98 +6590,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "muuda parooli"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "muuda parooli"
@@ -6689,103 +6694,103 @@ msgstr "muuda parooli"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genereeri uus v�tmepaar"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
@@ -7751,7 +7756,7 @@ msgstr "viga parooli loomisel: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -8067,12 +8072,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 9d9ca3eb1..f95ff2226 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -108,8 +108,8 @@ msgstr "väärä salasana"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -119,10 +119,10 @@ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1134,7 +1134,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
@@ -3375,20 +3375,20 @@ msgstr "allekirjoitus epäonnistui: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
@@ -3405,7 +3405,7 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
@@ -4209,12 +4209,12 @@ msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
@@ -4354,7 +4354,7 @@ msgstr "Halutun avaimen koko on %u bittiä\n"
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4370,7 +4370,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4386,40 +4386,40 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4427,19 +4427,19 @@ msgstr ""
 "Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
 "Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 #, fuzzy
 msgid ""
 "\n"
@@ -4457,44 +4457,44 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4505,7 +4505,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 
@@ -4520,23 +4520,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4544,12 +4544,12 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4561,7 +4561,7 @@ msgstr ""
 "tämän ohjelman valitsimella \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4573,50 +4573,50 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4625,12 +4625,12 @@ msgstr ""
 "Huomaa, että tätä avainta ei voida käyttää salaamiseen.  Käytä komentoa\n"
 "\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4638,7 +4638,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4646,26 +4646,26 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
@@ -6163,12 +6163,12 @@ msgstr "lukuvirhe: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronointi epäonnistui: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: kirjoittaminen epäonnistuin (n=%d): %s\n"
@@ -6212,82 +6212,82 @@ msgstr "%s: luotu trustdb ei kelpaa\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb luotu\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "HUOM: trustdb:n ei voida kirjoittaa\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: virhe päivitettäessä versiotietuetta: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: virhe luettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: virhe kirjoitettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb-tiedosto\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiotietue tietuenumerolla %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: tiedostoversio %d ei kelpaa\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: tietueen nollaaminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n"
 
@@ -6638,12 +6638,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6655,98 +6655,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "muuta salasanaa"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "muuta salasanaa"
@@ -6754,104 +6759,104 @@ msgstr "muuta salasanaa"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 #, fuzzy
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -7817,7 +7822,7 @@ msgstr "virhe luotaessa salasanaa: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -8133,12 +8138,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index e776f9ca8..4870ad2df 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -98,8 +98,8 @@ msgstr "mauvaise phrase de passe"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -109,10 +109,10 @@ msgstr "impossible de cr�er `%s': %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1136,7 +1136,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP n� %s d�tect�e\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
@@ -3383,21 +3383,21 @@ msgstr ""
 "La cl� poss�de seulement des items partiels ou stock�s sur carte -\n"
 "pas de phrase de passe � changer.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 "Les parties secr�tes de la cl� principale sont stock�es sur la\n"
 "carte.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
@@ -3412,7 +3412,7 @@ msgid ""
 "\n"
 msgstr "Entrez la nouvelle phrase de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "la phrase de passe n'a pas �t� correctement r�p�t�e ; recommencez."
 
@@ -4207,12 +4207,12 @@ msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
@@ -4350,7 +4350,7 @@ msgstr "La taille demand�e est %u bits\n"
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4366,7 +4366,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4382,38 +4382,38 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "La signature est valide pour ? (%s) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 msgid "Key does not expire at all\n"
 msgstr "La cl� n'expire pas du tout\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 msgid "Signature does not expire at all\n"
 msgstr "La signature n'expire pas du tout\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La cl� expire le %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4421,18 +4421,18 @@ msgstr ""
 "Votre syst�me ne sait pas afficher les dates au-del� de 2038.\n"
 "Cependant la gestion des dates sera correcte jusqu'� 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4448,44 +4448,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit faire au moins 5 caract�res de long\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4496,7 +4496,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Ne mettez pas d'adresse e-mail dans le nom r�el ou dans le commentaire\n"
@@ -4512,23 +4512,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (Q)uitter ? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4537,12 +4537,12 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4556,7 +4556,7 @@ msgstr ""
 "� --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4568,52 +4568,52 @@ msgstr ""
 "pendant la g�n�ration de nombres premiers; cela donne au g�n�rateur de\n"
 "nombres al�atoires une meilleure chance d'avoir assez d'entropie.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique dans `%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�criture d'une cl� secr�te partielle dans `%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s public n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s secret n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s public `%s': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s secret `%s': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "les cl�s publique et secr�te ont �t� cr��es et sign�es.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4622,13 +4622,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une sous-cl� �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
 
 # on s'amuse comme on peut...
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4636,7 +4636,7 @@ msgstr ""
 "la cl� a �t� cr��e %lu seconde dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4644,26 +4644,26 @@ msgstr ""
 "la cl� a �t� cr��e %lu secondes dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "NOTE: cr�er des sous-cl�s pour des cl�s v3 n'est pas conforme � OpenPGP\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 msgid "Really create? (y/N) "
 msgstr "Cr�er vraiment ? (o/N) "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "le stockage de la cl� dans la carte a �chou�: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTE: sauvegarde de la cl� de la carte dans `%s'\n"
@@ -6170,12 +6170,12 @@ msgstr "erreur de lecture dans `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance: la synchronisation a �chou�: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "enregistrement de base de confiance %lu: lseek a �chou�: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -6220,84 +6220,84 @@ msgstr "%s: base de confiance invalide cr��e\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: base de confiance cr��e\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTE: la base de confiance n'a pas les permissions d'�criture\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de confiance invalide\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: la cr�ation de la table de hachage a �chou�: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erreur pendant la mise � jour de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erreur pendant l'�criture de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de confiance: �lseek()� a �chou�: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de confiance: la lecture a �chou� (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ce n'est pas un fichier de base de confiance\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: enregistrement de version avec un num�ro %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: version %d du fichier invalide\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement libre: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 "%s: erreur pendant l'�criture de l'enregistrement de\n"
 "r�pertoire: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: n'a pu mettre un enregistrement � z�ro: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: impossible d'ajouter un enregistrement: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
 
@@ -6660,12 +6660,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "l'appel du PIN a retourn� une erreur: %s\n"
@@ -6677,102 +6677,107 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr "|N|Nouveau code PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "impossible de stocker la date de cr�ation: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr "la r�ponse ne contient pas les donn�es de cl� publique\n"
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr "la r�ponse ne contient pas le modulo RSA\n"
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la r�ponse ne contient pas l'exposant public RSA\n"
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 "Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
 "est %d\n"
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la v�rification CHV%d a �chou�: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr "l'acc�s aux commandes d'administration n'est pas configur�\n"
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr "erreur pendant la r�cup�ration de l'�tat CHV de la carte\n"
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr "la carte est irr�m�diablement bloqu�e !\n"
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "%d tentatives de PIN admin restent jusqu'� ce que la carte\n"
 "soit irr�m�diablement bloqu�e\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
@@ -6780,102 +6785,102 @@ msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr "|A|code PIN d'administration"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nouveau code PIN d'administration"
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 msgid "error reading application data\n"
 msgstr "erreur pendant la lecture de donn�es d'application\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 msgid "error reading fingerprint DO\n"
 msgstr "erreur pendant la lecture de l'empreinte DO\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 msgid "key already exists\n"
 msgstr "la cl� existe d�j�\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr "la cl� existante sera remplac�e\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 msgid "generating new key\n"
 msgstr "g�n�rer une nouvelle cl�\n"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr "l'horodatage de cr�ation est manquant\n"
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "le module RSA est manquant ou bien sa taille n'est pas %d bits\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "l'exposant public RSA est manquant ou trop �lev� (plus de %d bits)\n"
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 "le nombre premier RSA %s est manquant ou bien sa taille n'est pas\n"
 "%d bits\n"
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr "attendez que la cl� se g�n�re...\n"
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 msgid "generating key failed\n"
 msgstr "la g�n�ration de la cl� a �chou�\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "la g�n�ration de cl� a �t� effectu�e (%d secondes)\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structure de carte OpenPGP invalide (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures cr��es jusqu'ici: %lu\n"
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "la v�rification du code PIN d'administration est actuellement interdite\n"
 "au travers de cette commande\n"
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
@@ -7855,7 +7860,7 @@ msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -8172,12 +8177,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/gl.po b/po/gl.po
index b73dd6b9d..efc8b2d1b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -92,8 +92,8 @@ msgstr "contrasinal err�neo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -103,10 +103,10 @@ msgstr "non se pode crear `%s': %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1125,7 +1125,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
@@ -3374,20 +3374,20 @@ msgstr "fallou a sinatura: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
@@ -3404,7 +3404,7 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
@@ -4222,12 +4222,12 @@ msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de chave non v�lido; empregando %u bits\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
@@ -4367,7 +4367,7 @@ msgstr "O tama�o de chave requerido son %u bits\n"
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4383,7 +4383,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4399,40 +4399,40 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�Por canto tempo � v�lida a sinatura? (0) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4440,19 +4440,19 @@ msgstr ""
 "O seu sistema non pode amosar datas m�is al� do 2038.\n"
 "A�nda as�, hase tratar correctamente ata o 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 #, fuzzy
 msgid ""
 "\n"
@@ -4469,44 +4469,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4517,7 +4517,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor, non po�a o enderezo de correo no nome real ou no comentario\n"
@@ -4533,23 +4533,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)a�r? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)a�r? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4557,12 +4557,12 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4574,7 +4574,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4586,50 +4586,50 @@ msgstr ""
 "mentres se xeran os n�meros primos; isto proporci�nalle ao xerador de\n"
 "n�meros aleatorios unha opoertunidade de acumular entrop�a de abondo.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non se atopou un chaveiro p�blico no que se poida escribir: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "cre�ronse e asin�ronse as chaves p�blica e secreta.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4639,12 +4639,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4652,7 +4652,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4660,26 +4660,26 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a creaci�n de subchaves para chaves v3 non cumpre OpenPGP\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear realmente? "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
@@ -6167,12 +6167,12 @@ msgstr "erro de lectura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallou a sincronizaci�n: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "rexistro da base de datos de confianza %lu: lseek fallou: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -6217,82 +6217,82 @@ msgstr "%s: creouse unha base de datos de confianza incorrecta\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: creouse a base de datos de confianza\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: non se pode escribir na base de datos de confianza\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza non v�lida\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro ao actualiza-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao le-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: lseek fallou: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un ficheiro de base de datos de confianza\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: rexistro de versi�n con n�mero de rexistro %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n do ficheiro incorrecta %d\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: non se puido p�r a cero un rexistro: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: non se puido engadir un rexistro: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "a base de datos de confianza est� corrompida; execute \"gpg --fix-trustdb"
@@ -6647,12 +6647,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6664,98 +6664,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "cambia-lo contrasinal"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "cambia-lo contrasinal"
@@ -6763,103 +6768,103 @@ msgstr "cambia-lo contrasinal"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 #, fuzzy
 msgid "generating new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
@@ -7839,7 +7844,7 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -8156,12 +8161,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 69245de53..6fdd3bb34 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Hungarian <[email protected]>\n"
@@ -92,8 +92,8 @@ msgstr "rossz jelsz�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -103,10 +103,10 @@ msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1115,7 +1115,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
@@ -3348,20 +3348,20 @@ msgstr "Al��r�s sikertelen: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
@@ -3378,7 +3378,7 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
@@ -4181,12 +4181,12 @@ msgid "writing key binding signature\n"
 msgstr "�sszef�z� al��r�st �rok.\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
@@ -4326,7 +4326,7 @@ msgstr "A k�v�nt kulcsm�ret %u bit.\n"
 msgid "rounded up to %u bits\n"
 msgstr "Felkerek�tve %u bitre.\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4342,7 +4342,7 @@ msgstr ""
 "      <n>m = a kulcs n h�napig �rv�nyes\n"
 "      <n>y = a kulcs n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4358,40 +4358,40 @@ msgstr ""
 "      <n>m = az al��r�s n h�napig �rv�nyes\n"
 "      <n>y = az al��r�s n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "Meddig �rv�nyes a kulcs? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Meddig �rv�nyes az al��r�s? (0) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "�rv�nytelen �rt�k!\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s lej�r: %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4399,19 +4399,19 @@ msgstr ""
 "Az �n rendszere nem tud megjelen�teni 2038 ut�ni d�tumokat.\n"
 "Azonban kezelni helyesen tudja �ket eg�szen 2106-ig.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez �gy helyes (i/n)? "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 #, fuzzy
 msgid ""
 "\n"
@@ -4428,44 +4428,44 @@ msgstr ""
 "    \"Heinrich Heine (a k�lt�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Teljes n�v: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "E-mail c�m: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Ez nem �rv�nyes e-mail c�m.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Megjegyz�s: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�n a(z) %s karakterk�dol�st haszn�lja.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4476,7 +4476,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
 
@@ -4491,24 +4491,24 @@ msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (K)il�p�s? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (R)endben/(K)il�p�s? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4516,12 +4516,12 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4533,7 +4533,7 @@ msgstr ""
 "az \"--edit-key\" opci�val.\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4545,50 +4545,50 @@ msgstr ""
 "a lemezeket) a pr�msz�m gener�l�sa alatt. Ez seg�ti a v�letlensz�m-\n"
 "gener�tort, hogy entr�pi�t tudjon gy�jteni.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�rom a kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" nyilv�noskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "A nyilv�nos �s titkos kulcsokat l�trehoztam �s al��rtam.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4598,46 +4598,46 @@ msgstr ""
 "k�v�n ilyen c�lra l�trehozni, azt az \"--edit-key\" parancs seg�ts�g�vel\n"
 "teheti meg.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MEGJEGYZ�S: Alkulcsok l�trehoz�sa v3 kulcsokhoz nem OpenPGP-megfelel�.\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
@@ -6131,12 +6131,12 @@ msgstr "Olvas�si hiba: %s.\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "Bizalmi adatb�zis: szinkroniz�ci� sikertelen: %s.\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "Bizalmi adatb�zis %lu. rekord: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "Bizalmi adatb�zis %lu. rekord: �r�s sikertelen (n=%d): %s.\n"
@@ -6180,82 +6180,82 @@ msgstr "%s: �rv�nytelen bizalmi adatb�zis j�tt l�tre.\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "MEGJEGYZ�S: Bizalmi adatb�zis nem �rhat�.\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: �rv�nytelen bizalmi adatb�zis.\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord friss�t�sekor: %s.\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord olvas�sakor: %s.\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord �r�sakor: %s.\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "Bizalmi adatb�zis: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: Nem bizalmi adatb�zis.\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: Verzi�rekord, rekordsz�m: %lu.\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: �rv�nytelen �llom�nyverzi� (%d).\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Hiba k�nyvt�rrekord �r�sakor: %s.\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: Nem siker�lt egy rekord null�z�sa: %s.\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: Nem siker�lt egy rekord hozz�ad�sa: %s.\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Bizalmi adatb�zis s�r�lt. K�rem, futtassa: \"gpg --fix-trustdb\".\n"
 
@@ -6605,12 +6605,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6622,98 +6622,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "jelsz�v�ltoztat�s"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "jelsz�v�ltoztat�s"
@@ -6721,103 +6726,103 @@ msgstr "jelsz�v�ltoztat�s"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 #, fuzzy
 msgid "generating new key\n"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
@@ -7784,7 +7789,7 @@ msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 msgid "error storing flags: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -8100,12 +8105,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index c133e5568..44615e39b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -94,8 +94,8 @@ msgstr "passphrase yang buruk"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -105,10 +105,10 @@ msgstr "tidak dapat membuat %s: %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1118,7 +1118,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
@@ -3359,20 +3359,20 @@ msgstr "gagal menandai: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
@@ -3389,7 +3389,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
@@ -4195,12 +4195,12 @@ msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
@@ -4340,7 +4340,7 @@ msgstr "Keysize yang diminta adalah %u bit\n"
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4356,7 +4356,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4372,40 +4372,40 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4413,19 +4413,19 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 #, fuzzy
 msgid ""
 "\n"
@@ -4441,44 +4441,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4488,7 +4488,7 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 
@@ -4503,23 +4503,23 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4527,12 +4527,12 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4545,7 +4545,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4557,50 +4557,50 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4610,45 +4610,45 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
@@ -6126,12 +6126,12 @@ msgstr "kesalahan pembacaan: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek gagal: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -6175,82 +6175,82 @@ msgstr "%s: tercipta trustdb tidak valid\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: tercipta trustdb\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "CATATAN: trustdb tidak dapat ditulisi\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb tidak valid\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: kesalahan memperbaharui catatan versi: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: kesalahan membaca catatan versi: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: kesalahan menulis catatan versi: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek gagal: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bukan file trustdb\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: catatan versi dengan recnum %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi file %d tidak valid\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: kesalahan menulis dir record: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: gagal mengosongkan record: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: gagal menambahkan record: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
 
@@ -6599,12 +6599,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6616,98 +6616,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "ubah passphrase"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "ubah passphrase"
@@ -6715,103 +6720,103 @@ msgstr "ubah passphrase"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 #, fuzzy
 msgid "generating new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@ -7778,7 +7783,7 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -8094,12 +8099,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 4494d754e..861240ebf 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2008-05-26 12:02+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -92,8 +92,8 @@ msgstr "passphrase errata"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -103,10 +103,10 @@ msgstr "impossibile creare `%s': %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1116,7 +1116,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "impossibile fare questo in modo batch\n"
@@ -3364,20 +3364,20 @@ msgstr "firma fallita: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
@@ -3394,7 +3394,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
@@ -4208,12 +4208,12 @@ msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
@@ -4353,7 +4353,7 @@ msgstr "La dimensione richiesta della chiave � %u bit\n"
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4369,7 +4369,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4385,40 +4385,40 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s scadr� il %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4426,19 +4426,19 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 #, fuzzy
 msgid ""
 "\n"
@@ -4455,44 +4455,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4503,7 +4503,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 
@@ -4518,23 +4518,23 @@ msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4542,12 +4542,12 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4559,7 +4559,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4571,50 +4571,50 @@ msgstr ""
 "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
 "numeri casuali migliori possibilit� di raccogliere abbastanza entropia.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4624,12 +4624,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4637,7 +4637,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4645,26 +4645,26 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crea davvero? "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
@@ -6169,12 +6169,12 @@ msgstr "errore di lettura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek fallita: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
@@ -6218,82 +6218,82 @@ msgstr "%s: � stato creato un trustdb non valido\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: creato il trustdb\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: il trustdb non � scrivibile\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb non valido\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: errore durante l'aggiornamento del record di versione: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: errore durante la lettura del record di versione: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: errore durante la scrittura del record di versione: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fallita: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un file di trustdb\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: record di versione con recnum %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versione %d del file non valida\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: errore durante la scrittura del dir record: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: azzeramento di un record fallito: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: accodatura a un record fallita: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Il trustdb � danneggiato; eseguire \"gpg --fix-trust-db\".\n"
 
@@ -6643,12 +6643,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6660,98 +6660,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "cambia la passphrase"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "cambia la passphrase"
@@ -6759,103 +6764,103 @@ msgstr "cambia la passphrase"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera una nuova coppia di chiavi"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
@@ -7821,7 +7826,7 @@ msgstr "errore nella creazione della passhprase: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -8137,12 +8142,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 4400cc9e3..db220982e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -96,8 +96,8 @@ msgstr "�ѥ��ե졼���������Ǥ�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -107,10 +107,10 @@ msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1117,7 +1117,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
@@ -3271,20 +3271,20 @@ msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
@@ -3301,7 +3301,7 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
@@ -4080,12 +4080,12 @@ msgid "writing key binding signature\n"
 msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ�Ĺ��%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��Ĺ��%u�ӥåȤ˴ݤ�ޤ�\n"
@@ -4223,7 +4223,7 @@ msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4239,7 +4239,7 @@ msgstr ""
 "      <n>m = ���� n ����֤���λ\n"
 "      <n>y = ���� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4255,40 +4255,40 @@ msgstr ""
 "      <n>m = ��̾�� n ����֤���λ\n"
 "      <n>y = ��̾�� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "��̾��ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s��%s����λ���ޤ�\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4296,18 +4296,18 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ���������갷���ޤ���\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 msgid "Is this correct? (y/N) "
 msgstr "������������Ǥ���? (y/N) "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4323,44 +4323,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ�������%s�פ�ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4371,7 +4371,7 @@ msgstr ""
 "    ��%s��\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
@@ -4386,23 +4386,23 @@ msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4410,12 +4410,12 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4427,7 +4427,7 @@ msgstr ""
 "�Ρ�--edit-key�ɥ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4438,50 +4438,50 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤤ�����ޤ���\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "�������������ä���ޤ�����\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�������������̾���ޤ�����\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4490,42 +4490,42 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ɥ��ޥ�ɤ�Ȥä��������������Ƥ���������\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 msgid "Really create? (y/N) "
 msgstr "�����˺������ޤ���? (y/N) "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
@@ -5945,12 +5945,12 @@ msgstr "��%s�פ��ɽФ����顼: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "���ѥǡ����١���: Ʊ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: ����ߤ˼��Ԥ��ޤ��� (n=%d): %s\n"
@@ -5994,82 +5994,82 @@ msgstr "%s: ̵���ʿ��ѥǡ����١��������\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: ���ѥǡ����١������Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "����: ���ѥǡ����١��������������ǽ�Ǥ�\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ̵���ʿ��ѥǡ����١���\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤι������顼: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "���ѥǡ����١���: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "���ѥǡ����١���: �ɽФ��˼��Ԥ��ޤ��� (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ���ѥǡ����١������ե�����ǤϤ���ޤ���\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: �쥳�����ֹ�%lu�֤ΥС�����󡦥쥳����\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ̵���ʥե����롦�С������%d\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: �����쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �쥳���ɤν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �쥳���ɤ��ɲä˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�ɤ�¹Ԥ��Ƥ���������\n"
@@ -6422,12 +6422,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
@@ -6439,99 +6439,104 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 #, fuzzy
 msgid "|N|New PIN"
 msgstr "������PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "���������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "PIN [��̾��: %lu]"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "PIN [��̾��: %lu]"
@@ -6539,99 +6544,99 @@ msgstr "PIN [��̾��: %lu]"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "|A|������Admin PIN"
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 msgid "error reading application data\n"
 msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 msgid "error reading fingerprint DO\n"
 msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 msgid "key already exists\n"
 msgstr "���Ϥ⤦����ޤ�\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 msgid "generating new key\n"
 msgstr "��������������\n"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr "�������δ֡����Ԥ��������� ...\n"
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 msgid "generating key failed\n"
 msgstr "���������˼��Ԥ��ޤ���\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "������������λ���ޤ��� (%d��)\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
@@ -7606,7 +7611,7 @@ msgstr "������PIN�μ������顼: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -7919,12 +7924,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index 9d40a1b29..9189690a6 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <[email protected]>\n"
 "Language-Team: Norwegian Bokm�l <[email protected]>\n"
@@ -96,8 +96,8 @@ msgstr "ugyldig passfrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -107,10 +107,10 @@ msgstr "kan ikke opprette �%s�: %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1105,7 +1105,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kortnummer %s oppdaget\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "kan ikke gj�re dette i batchmodus\n"
 
@@ -3254,19 +3254,19 @@ msgstr "signering mislyktes: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Denne n�kkelen er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er ikke tilgjengelig.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er lagret p� kort.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "N�kkelen er beskyttet.\n"
 
@@ -3281,7 +3281,7 @@ msgid ""
 "\n"
 msgstr "Tast inn den nye passfrasen for denne hemmelige n�kklen.\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "passfrasen ble ikke gjentatt korrekt; pr�v igjen"
 
@@ -4015,12 +4015,12 @@ msgid "writing key binding signature\n"
 msgstr "skriver n�kkelbindende signatur\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "n�kkelst�rrelsen er ugyldig; bruker %u bits\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "n�kkelst�rrelsen ble rundet opp til %u bits\n"
@@ -4162,7 +4162,7 @@ msgstr "�nsket n�kkelst�rrelse er %u bits\n"
 msgid "rounded up to %u bits\n"
 msgstr "rundet opp til %u bits\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4178,7 +4178,7 @@ msgstr ""
 "      <n>m = n�kkelen utg�r om n months\n"
 "      <n>y = n�kkelen utg�r om n years\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4194,38 +4194,38 @@ msgstr ""
 "      <n>m = signaturen utg�r om n months\n"
 "      <n>y = signaturen utg�r om n years\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "N�kkelen er gyldig for? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen er gyldig for? (%s) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "ugyldig verdi\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 msgid "Key does not expire at all\n"
 msgstr "N�kkel utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "N�kkel utg�r den %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen utg�r den %s\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4233,18 +4233,18 @@ msgstr ""
 "Systemet ditt kan ikke vise datoer etter 2038.\n"
 "Likevel vil det bli h�ndtert korrekt opp til 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/N)? "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4260,44 +4260,44 @@ msgstr ""
 "    �Heinrich Heine (Der Dichter) <[email protected]>�\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Fullt navn: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Ugyldig tegn i navn\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Navnet kan ikke starte med et siffer\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navnet m� v�re minst 5 tegn langt\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Ugyldig tegn i kommentar\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruker tegnsettet �%s�.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4308,7 +4308,7 @@ msgstr ""
 "    �%s�\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Vennligst ikke putt epostadressen inn i fullt navn eller i kommentaren\n"
@@ -4324,23 +4324,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnKeEeRrAa"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Vennligst korriger feilen f�rst\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4348,12 +4348,12 @@ msgstr ""
 "Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4365,7 +4365,7 @@ msgstr ""
 "hjelp av dette programmet og valget �--edit-key�.\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4377,50 +4377,50 @@ msgstr ""
 "diskene jobbe) under primtallgenereringen; dette gir\n"
 "tilfeldig-tall-generatoren en bedre sjanse til � samle nok entropy.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "N�kkelgenereringen ble avbrutt.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentlig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver forel�pig hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbart offentlig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbart hemmelig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "feil ved skriving av offentlig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�kkel opprettet og signert.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4429,13 +4429,13 @@ msgstr ""
 "kanskje � bruke kommandoen �--edit-key� for � generere en\n"
 "sekund�rn�kkel for dette form�let.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "N�kkelgenerering mislyktes: %s\n"
 
 # Er dette entallsformen av denne strengen?
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4444,7 +4444,7 @@ msgstr ""
 "klokkeproblem)\n"
 
 # Er dette flertallsformen av denne og den forrige strengen?
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4452,27 +4452,27 @@ msgstr ""
 "n�kkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MERK: opprettelse av undern�kler for v3-n�kler er ikke i samsvar med "
 "OpenPGP\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 msgid "Really create? (y/N) "
 msgstr "Virkelig opprette? (j/N)"
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "lagring av n�kkel p� kort mislyktes: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -5894,12 +5894,12 @@ msgstr "lesefeil ved �%s�: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -5943,82 +5943,82 @@ msgstr ""
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
@@ -6360,12 +6360,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-callback returnerte en feil: %s\n"
@@ -6377,98 +6377,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "feil ved henting av ny PIN: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "klarte ikke � lagre opprettelsesdatoen: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr "respons inneholder ikke data om offentlig n�kkel\n"
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr "respons inneholder ikke RSA-modulus\n"
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr "feil ved henting av CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr "kort er permanent l�st!\n"
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d Admin PIN-fors�k f�r kortet blir l�st permanent\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
@@ -6476,98 +6481,98 @@ msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN"
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 msgid "error reading application data\n"
 msgstr "feil ved lesing av applikasjonsdata\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 msgid "error reading fingerprint DO\n"
 msgstr "feil ved lesing av fingeravtrykk DO\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 msgid "key already exists\n"
 msgstr "n�kkel finnes allerede\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr "eksisterende n�kkel vil bli erstattet\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 msgid "generating new key\n"
 msgstr "generere en ny n�kkel\n"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr "tidsstempel for opprettelse mangler\n"
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA-modulus mangler eller har ikke en st�rrelse p� %d bits\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "offentlig RSA-eksponent mangler eller er st�rre enn %d bits\n"
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtall %s mangler eller har ikke en st�rrelse p� %d bits\n"
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr "vennligst vent mens n�kkel blir generert ...\n"
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 msgid "generating key failed\n"
 msgstr "n�kkelgenerering mislyktes\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "n�kkelgenerering fullf�rt (%d sekunder)\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet st�tter ikke digestalgoritme %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer opprettet s� langt: %lu\n"
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "bekrefting av Admin PIN er forel�pig nektet gjennom denne kommandoen\n"
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
@@ -7538,7 +7543,7 @@ msgstr "feil ved henting av ny PIN: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -7850,12 +7855,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index fc5580a01..3f7d10a46 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.7\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2007-11-26 19:01+0100\n"
 "Last-Translator: Jakub Bogusz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -92,8 +92,8 @@ msgstr "Has�o"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "klucze ssh wi�ksze ni� %d bit�w nie s� obs�ugiwane\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -103,10 +103,10 @@ msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1118,7 +1118,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "Wykryto kart� OpenPGP nr %s\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
@@ -3301,19 +3301,19 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Klucz ma tylko za�lepk� albo elementy na karcie - nie ma has�a do zmiany.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Cz�� tajna g��wnego klucza jest zapisana na karcie.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
@@ -3330,7 +3330,7 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
@@ -4104,12 +4104,12 @@ msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmiar klucza zaokr�glony w g�r� do %u bit�w\n"
@@ -4249,7 +4249,7 @@ msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4265,7 +4265,7 @@ msgstr ""
 "      <n>m = termin wa�no�ci klucza up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci klucza up�ywa za n lat\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4281,38 +4281,38 @@ msgstr ""
 "      <n>m = termin wa�no�ci podpisu up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci podpisu up�ywa za n lat\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Okres wa�no�ci podpisu? (%s) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 msgid "Key does not expire at all\n"
 msgstr "Klucz nie wyga�nie w og�le\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 msgid "Signature does not expire at all\n"
 msgstr "Podpis nie wyga�nie w og�le\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Klucz traci wa�no�� %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Wa�no�� podpisu wygasa %s\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4320,18 +4320,18 @@ msgstr ""
 "Tw�j system nie potrafi pokaza� daty po roku 2038.\n"
 "Niemniej daty do roku 2106 b�d� poprawnie obs�ugiwane.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko si� zgadza (t/N)? "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4347,44 +4347,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imi� i nazwisko musz� mie� co najmniej 5 znak�w d�ugo�ci.\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4395,7 +4395,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Nie nale�y umieszcza� adresu poczty elektronicznej w polu nazwiska czy\n"
@@ -4412,25 +4412,25 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj��? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, przej�� (D)alej,\n"
 "czy (W)yj�� z programu? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4438,12 +4438,12 @@ msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4455,7 +4455,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4471,50 +4471,50 @@ msgstr ""
 "ilo�ci\n"
 "entropii.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w ,,%s''\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuj� za�lepk� klucza tajnego w ,,%s''\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w ,,%s''\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4522,12 +4522,12 @@ msgstr ""
 "Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\"\n"
 "mo�na doda� do niego podklucz szyfruj�cy.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4535,7 +4535,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4543,26 +4543,26 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzy�? (t/N) "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zapis klucza na karcie nie powi�d� si�: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nie mo�na utworzy� pliku kopii zapasowej ,,%s'': %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "UWAGA: kopia zapasowa klucza karty zapisana do ,,%s''\n"
@@ -6027,12 +6027,12 @@ msgstr "b��d odczytu w ,,%s'': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "baza zaufania, wpis %lu: funkcja lseek() nie powiod�a si�: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "baza zaufania, wpis %lu: zapis nie powi�d� si� (n=%d): %s\n"
@@ -6076,82 +6076,82 @@ msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: baza zaufania utworzona\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "UWAGA: nie mo�na zapisywa� bazy zaufania\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: b��d przy uaktualnianiu numeru wersji: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: b��d odczytu numeru wersji: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: b��d zapisu numeru wersji: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "baza zaufania: funkcja lseek() zawiod�a: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: to nie jest plik bazy zaufania\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: wpis wersji z numerem %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: niew�a�ciwa wersja pliku %d\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: zerowanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Baza zaufania jest uszkodzona; prosz� uruchomi� ,,gpg --fix-trustdb''.\n"
@@ -6495,12 +6495,12 @@ msgstr ""
 "Sk�adnia: kbxutil [opcje] [pliki]\n"
 "wypisywanie, eksport, import danych Keybox\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||Prosz� wprowadzi� PIN na klawiaturze czytnika"
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Zapytanie zwrotne o PIN zwr�ci�o b��d: %s\n"
@@ -6512,92 +6512,97 @@ msgstr "NullPIN nie zosta� jeszcze zmieniony\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr "|N|Nowy PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nie powi�d� si� zapis odcisku: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "nie powi�d� si� zapis daty utworzenia: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "odczyt klucza publicznego nie powi�d� si�: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr "odpowied� nie zawiera danych klucza publicznego\n"
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpowied� nie zawiera wsp�czynnika RSA\n"
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpowied� nie zawiera publicznego wyk�adnika RSA\n"
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 "||Prosz� wprowadzi� PIN na klawiaturze czytnika%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Prosz� wpisa� PIN%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Prosz� wpisa� PIN%%0A[podpis�w wykonanych: %lu]"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN dla CHV%d jest zbyt kr�tki; minimalna d�ugo�� to %d\n"
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "weryfikacja CHV%d nie powiod�a si�: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr "dost�p do polece� administratora nie zosta� skonfigurowany\n"
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr "b��d podczas odczytu stanu CHV z karty\n"
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr "karta zosta�a trwale zablokowana!\n"
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "Zosta�o %d pr�b PIN-u administratora do trwa�ego zablokowania karty\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
@@ -6605,7 +6610,7 @@ msgid ""
 msgstr ""
 "||Prosz� wprowadzi� PIN na klawiaturze czytnika%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "||Prosz� wprowadzi� PIN na klawiaturze czytnika"
@@ -6613,99 +6618,99 @@ msgstr "||Prosz� wprowadzi� PIN na klawiaturze czytnika"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr "|A|PIN administratora"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nowy PIN administratora"
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 msgid "error reading application data\n"
 msgstr "b��d podczas odczytu danych aplikacji\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 msgid "error reading fingerprint DO\n"
 msgstr "b��d podczas odczytu odcisku DO\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 msgid "key already exists\n"
 msgstr "klucz ju� istnieje\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr "istniej�cy klucz zostanie zast�piony\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 msgid "generating new key\n"
 msgstr "generowanie nowego klucza\n"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr "brak datownika utworzenia\n"
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "reszta RSA brakuj�ca lub o rozmiarze innym ni� %d bity\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "publiczny wyk�adnik RSA brakuj�cy lub wi�kszy ni� %d bity\n"
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "liczba pierwsza %s RSA brakuj�ca lub o rozmiarze innym ni� %d bit�w\n"
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nie powi�d� si� zapis klucza: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr "prosz� czeka� na wygenerowanie klucza...\n"
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 msgid "generating key failed\n"
 msgstr "generowanie klucza nie powiod�o si�\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generowanie klucza zako�czone (%d sekund)\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr "odcisk na karcie nie zgadza si� z ��danym\n"
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "karta nie obs�uguje algorytmu skr�tu %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dotychczas stworzono podpis�w: %lu\n"
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "weryfikacja PIN-u administratora tym poleceniem jest aktualnie zabroniona\n"
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie mo�na dosta� si� do %s - niepoprawna karta OpenPGP?\n"
@@ -7633,7 +7638,7 @@ msgstr "b��d pobierania zapisanych flag: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "b��d zapisywania flag: %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 #, fuzzy
 msgid "Error - "
 msgstr "[B��d - Brak nazwy]"
@@ -7952,12 +7957,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr "Konfiguracja dla OCSP"
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr "Uwaga, okre�lenia grup s� ignorowane\n"
 
diff --git a/po/pt.po b/po/pt.po
index d8aa77c8b..a4e93dbc7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -95,8 +95,8 @@ msgstr "frase secreta incorrecta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -106,10 +106,10 @@ msgstr "imposs�vel criar `%s': %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1121,7 +1121,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
@@ -3360,20 +3360,20 @@ msgstr "assinatura falhou: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
@@ -3390,7 +3390,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
@@ -4194,12 +4194,12 @@ msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
@@ -4339,7 +4339,7 @@ msgstr "O tamanho de chave pedido � %u bits\n"
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4355,7 +4355,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4371,40 +4371,40 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4412,19 +4412,19 @@ msgstr ""
 "O seu sistema n�o consegue mostrar datas para al�m de 2038.\n"
 "No entanto, estas v�o ser tratadas correctamente at� 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 #, fuzzy
 msgid ""
 "\n"
@@ -4442,44 +4442,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4490,7 +4490,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor n�o coloque o endere�o de email no nome verdadeiro ou no "
@@ -4507,23 +4507,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4531,12 +4531,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4548,7 +4548,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4560,50 +4560,50 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma hip�tese maior de ganhar entropia suficiente.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenhum porta-chaves p�blico com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenhum porta-chaves secreto com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves p�blico `%s': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4612,12 +4612,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para cifragem. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4625,7 +4625,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4633,26 +4633,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a cria��o de sub-chave para chaves v3 n�o respeito o OpenPGP\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
@@ -6134,12 +6134,12 @@ msgstr "armadura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "base de dados de confian�a rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "base de dados de confian�a rec %lu: escrita falhou (n=%d): %s\n"
@@ -6183,82 +6183,82 @@ msgstr "%s: base de dados de confian�a inv�lida criada\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: base de dados de confian�a criada\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: n�o � poss�vel escrever na trustdb\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de dados de confian�a inv�lida\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro a actualizar registo de vers�o: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escrever registo de vers�o: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dados de confian�a: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um base de dados de confian�a\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registo de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registo: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registo: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "A base de dados de confian�a est� danificada; por favor execute\n"
@@ -6613,12 +6613,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6630,98 +6630,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "muda a frase secreta"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "muda a frase secreta"
@@ -6729,103 +6734,103 @@ msgstr "muda a frase secreta"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%s' j� comprimido\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -7798,7 +7803,7 @@ msgstr "erro na cria��o da frase secreta: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -8116,12 +8121,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c9ad9278c..efb241b95 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: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -99,8 +99,8 @@ msgstr "frase secreta incorreta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, fuzzy, c-format
@@ -110,10 +110,10 @@ msgstr "imposs�vel criar %s: %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1127,7 +1127,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
@@ -3364,21 +3364,21 @@ msgstr "assinatura falhou: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
@@ -3395,7 +3395,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
@@ -4199,12 +4199,12 @@ msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
@@ -4344,7 +4344,7 @@ msgstr "O tamanho de chave pedido � %u bits\n"
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4360,7 +4360,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -4377,40 +4377,40 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4418,19 +4418,19 @@ msgstr ""
 "Seu sistema n�o consegue mostrar datas al�m de 2038.\n"
 "Apesar disso, elas ser�o corretamente manipuladas at� 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 #, fuzzy
 msgid ""
 "\n"
@@ -4447,44 +4447,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4495,7 +4495,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4510,24 +4510,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4535,12 +4535,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4552,7 +4552,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4564,50 +4564,50 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma chance melhor de conseguir entropia suficiente.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4616,12 +4616,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para criptografia. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4629,7 +4629,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4637,26 +4637,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
@@ -6141,12 +6141,12 @@ msgstr "erro de leitura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "banco de dados de confiabilidade: sincroniza��o falhou: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: escrita falhou (n=%d): %s\n"
@@ -6190,82 +6190,82 @@ msgstr "%s: banco de dados de confiabilidade inv�lido criado\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade criado\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro atualizando registro de vers�o: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro escrevendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de arquivo inv�lida %d\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro escrevendo registro de diret�rio: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registro: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registro: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "O banco de dados de confiabilidade est� danificado; por favor rode\n"
@@ -6620,12 +6620,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6637,98 +6637,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "muda a frase secreta"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "muda a frase secreta"
@@ -6736,103 +6741,103 @@ msgstr "muda a frase secreta"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%lu chaves processadas\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -7811,7 +7816,7 @@ msgstr "erro na cria��o da frase secreta: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -8129,12 +8134,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/ro.po b/po/ro.po
index 575677cf9..43d643875 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -98,8 +98,8 @@ msgstr "fraz�-parol� incorect�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -109,10 +109,10 @@ msgstr "nu pot crea `%s': %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1124,7 +1124,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
@@ -3317,19 +3317,19 @@ msgstr ""
 "Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz� "
 "parol� de schimbat.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Aceast� cheie nu este protejat�.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "P�r�i secrete ale cheii primare sunt stacate pe card.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "Cheia este protejat�.\n"
 
@@ -3346,7 +3346,7 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
@@ -4116,12 +4116,12 @@ msgid "writing key binding signature\n"
 msgstr "scriu semn�tur� legat� de cheie\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjit� la %u bi�i\n"
@@ -4259,7 +4259,7 @@ msgstr "Lungimea cheii necesar� este %u bi�i\n"
 msgid "rounded up to %u bits\n"
 msgstr "rotunjit� prin adaos la %u bi�i\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4275,7 +4275,7 @@ msgstr ""
 "      <n>m = cheia expir� �n n luni\n"
 "      <n>y = cheia expir� �n n ani\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4291,38 +4291,38 @@ msgstr ""
 "      <n>m = semn�tura expir� �n n luni\n"
 "      <n>y = semn�tura expir� �n n ani\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "Cheia este valid� pentru? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Semn�tura este valid� pentru? (%s) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "valoare invalid�\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 msgid "Key does not expire at all\n"
 msgstr "Cheia nu expir� deloc\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 msgid "Signature does not expire at all\n"
 msgstr "Semn�tura nu expir� deloc\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Cheia expir� pe %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Semn�tura expir� pe %s\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4330,18 +4330,18 @@ msgstr ""
 "Sistemul d-voastr� nu poate afi�a date dup� 2038.\n"
 "Totu�i, acestea vor fi corect m�nuite p�n� �n 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4358,44 +4358,44 @@ msgstr ""
 "    \"Popa Ioan (popic�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid �n nume\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate �ncepe cu o cifr�\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Numele trebuie s� fie de cel pu�in 5 caractere\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Adres� de email: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Nu este o adres� de email valid�\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid �n comentariu\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Folosi�i setul de caractere `%s'\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4406,7 +4406,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
 
@@ -4421,23 +4421,23 @@ msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (T)Termin�? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin�? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4445,12 +4445,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4461,7 +4461,7 @@ msgstr ""
 "O s� o fac oricum.  Pute�i schimba fraza-parol� oric�nd, folosind acest\n"
 "program cu op�iunea \"--edit-key\".\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4473,50 +4473,50 @@ msgstr ""
 "�n timpul gener�rii numerelor prime; aceasta d� o �ans� generatorului de\n"
 "numere aleatoare o �ans� mai bun� de a aduna destul� entropie.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulat�.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scriu cheia public� �n `%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scriu talonul (stub) cheii secrete �n `%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nu am g�sit nici un inel de chei public de scris: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nu am g�sit nici un inel de chei secret de scris: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secret� �i public� au fost create �i semnate.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4526,12 +4526,12 @@ msgstr ""
 "s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4539,7 +4539,7 @@ msgstr ""
 "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4547,25 +4547,25 @@ msgstr ""
 "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOT�: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 msgid "Really create? (y/N) "
 msgstr "Crea�i �ntr-adev�r? (d/N) "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "stocarea cheii pe card a e�uat: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOT�: copia de siguran�a a cheii cardului salvat� la `%s'\n"
@@ -6031,12 +6031,12 @@ msgstr "eroare citire �n `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sincronizarea a e�uat: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek a e�uat: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrierea a e�uat (n=%d): %s\n"
@@ -6080,82 +6080,82 @@ msgstr "%s: a fost creat trustdb invalid\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: a fost creat trustdb\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOT�: nu poate fi scris �n trustdb\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb invalid\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: am e�uat s� creez hashtable: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eroare actualizare �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eroare citire �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eroare scriere �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek a e�uat: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: citirea a e�uat (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nu e un fi�ier trustdb\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: �nregistrare versiune cu recnum %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versiune fi�ier invalid� %d\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eroare citire �nregistrare liber�: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eroare scriere �nregistrare dir: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: eroare setere la zero a �nregistr�rii: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: ad�ugarea unei �nregistr�ri a e�uat: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb este corupt�; rula�i \"gpg --fix-trustdb\".\n"
 
@@ -6504,12 +6504,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
@@ -6521,98 +6521,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eroare la ob�inere noului PIN: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "am e�uat s� stochez data cre�rii: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr "r�spunsul nu con�ine datele cheii publice\n"
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr "r�spunsul nu con�ine modulul RSA\n"
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr "r�spunsul nu con�ine exponentul public RSA\n"
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a e�uat: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr "accesul la comenzile de administrare nu este configurat�\n"
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr "eroare la recuperarea st�rii CHV de pe card\n"
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr "cardul este �ncuiat permanent!\n"
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
@@ -6620,99 +6625,99 @@ msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr "|A|PIN Admin"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr "|AN|PIN Admin Nou"
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 msgid "error reading application data\n"
 msgstr "eroare la citirea datelor aplica�iei\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 msgid "error reading fingerprint DO\n"
 msgstr "eroare la citirea amprentei DO\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 msgid "key already exists\n"
 msgstr "cheia exist� deja\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr "cheia existent� va fi �nlocuit�\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 msgid "generating new key\n"
 msgstr "generez o nou� cheie\n"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr "timestamp-ul de creare lipse�te\n"
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "modulus-ul RSA lipse�te sau nu are %d bi�i\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "exponentul public RSA lipse�te sau are mai mult de %d bi�i\n"
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "prime-ul RSA %s lipse�te sau nu are %d bi�i\n"
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr "v� rug�m a�tepta�i c�t� vreme este creat� noua cheie ...\n"
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 msgid "generating key failed\n"
 msgstr "generarea cheii a e�uat\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generarea cheii este complet� (%d secunde)\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "verificarea PIN-ului Admin este deocamdat� interzis� prin aceast� comand�\n"
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@ -7684,7 +7689,7 @@ msgstr "eroare la ob�inere noului PIN: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -7999,12 +8004,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index d11b2b47f..f83b7a594 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.0.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2006-11-07 19:31+0300\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -88,8 +88,8 @@ msgstr "Фраза-пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "не поддерживаются ssh ключи превышающие %d бит\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -99,10 +99,10 @@ msgstr "не могу создать `%s': %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1097,7 +1097,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
@@ -3256,19 +3256,19 @@ msgstr "не удалось подписать: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Данный ключ не защищен.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретная часть главного ключа сохранена на карте.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "Ключ защищен.\n"
 
@@ -3285,7 +3285,7 @@ msgstr ""
 "Введите новую фразу-пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод фразы-пароля некорректен; попробуйте еще раз"
 
@@ -4033,12 +4033,12 @@ msgid "writing key binding signature\n"
 msgstr "сохраняем объединяющую подпись\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; используется %u бит\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа приведен к %u битам\n"
@@ -4178,7 +4178,7 @@ msgstr "Запрашиваемый размер ключа %u бит\n"
 msgid "rounded up to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4194,7 +4194,7 @@ msgstr ""
 "      <n>m = срок действительности n месяцев\n"
 "      <n>y = срок действительности n лет\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4210,38 +4210,38 @@ msgstr ""
 "      <n>m = срок действительности подписи n месяцев\n"
 "      <n>y = срок действительности подписи n лет\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "Ключ действителен до? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпись действительна до? (%s) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "недопустимое значение\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 msgid "Key does not expire at all\n"
 msgstr "Ключ не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 msgid "Signature does not expire at all\n"
 msgstr "Подпись не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ действителен до: %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпись действительна до: %s\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4249,18 +4249,18 @@ msgstr ""
 "Ваша система не может корректно отображать даты после 2038.\n"
 "Однако, даты не превышающие 2106 будут обработаны корректно.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 msgid "Is this correct? (y/N) "
 msgstr "Все верно? (y/N) "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4275,44 +4275,44 @@ msgstr ""
 "    \"Baba Yaga (pensioner) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Ваше настоящее имя: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в Имени\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Имя не должно начинаться с цифры\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Имя не должно быть короче 5 символов\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Email-адрес: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Неправильный e-mail адрес\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Комментарий: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Недопустимый символ в комментарии\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Используемая таблица символов: `%s'.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4323,7 +4323,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Не вставляйте email-адрес в имя пользователя или комментарий\n"
 
@@ -4338,24 +4338,24 @@ msgstr "Не вставляйте email-адрес в имя пользоват�
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4363,12 +4363,12 @@ msgstr ""
 "Для защиты секретного ключа необходима фраза-пароль.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4380,7 +4380,7 @@ msgstr ""
 "запустив данную программу с ключом \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4393,50 +4393,50 @@ msgstr ""
 "обращения к дискам) в процессе генерации; это даст генератору\n"
 "случайных чисел возможность получить лучшую энтропию.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "сохранение открытого ключа в `%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "сохранение заглушки секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и закрытый ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4444,44 +4444,44 @@ msgstr ""
 "Учтите, данный ключ не может использоваться для шифрования.  Можно\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "ЗАМЕЧАНИЕ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? (y/N)"
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "сбой сохранения ключа на карту: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "не могу создать резервную копию, файл `%s': %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: архивная копия ключа карты сохранена в `%s'\n"
@@ -5931,12 +5931,12 @@ msgstr "ошибка чтения в `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -5980,82 +5980,82 @@ msgstr "%s: создана недействительная таблица до�
 msgid "%s: trustdb created\n"
 msgstr "%s: создана таблица доверий\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "ЗАМЕЧАНИЕ: таблица доверий доступна только для чтения\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: недействительная таблица доверий\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: сбой создания таблицы хэшей: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ошибка обновления записи о версии: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ошибка чтения записи о версии: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ошибка сохранения записи о версии: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: не является файлом таблицы доверий\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: запись о версии с номером записи %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: неправильная версия файла %d\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ошибка чтения свободной записи: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ошибка внесения записи каталога: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: сбой обнуления записи: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: сбой добавления записи: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "таблица доверий повреждена; запустите \"gpg --fix-trustdb\".\n"
 
@@ -6404,12 +6404,12 @@ msgstr ""
 "Синтаксис: kbxutil [параметры] [файлы]\n"
 "просморт, экспорт, импорт данных Keybox\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6421,99 +6421,104 @@ msgstr "NullPIN всё еще не изменен\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr "|N|Новый PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при получении нового PIN: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "сбой сохранения отпечатка: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "сбой сохранения даты создания: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "сбой чтения открытого ключа: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr "ответ не содержит данных открытого ключа\n"
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr "в ответе отсутствует модуль RSA\n"
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr "в ответе отсутствует открытая экспонента RSA\n"
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Введите PIN%%0A[подписей: %lu]"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "при проверке CHV%d сбой: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr "доступ к командам управления не настроен\n"
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получения статуса CHV с карты\n"
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr "карта заблокирована!\n"
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "осталось %d попыток ввода административного PIN перед блокировкой карты\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
@@ -6521,99 +6526,99 @@ msgstr "||Введите PIN%%0A[подписей: %lu]"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr "|A|Административный PID"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Новый административный PIN"
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 msgid "error reading application data\n"
 msgstr "ошибка чтения данных приложения\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 msgid "error reading fingerprint DO\n"
 msgstr "ошибка чтения отпечатка DO\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 msgid "key already exists\n"
 msgstr "ключ уже существует\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr "существующий ключ будет заменен\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 msgid "generating new key\n"
 msgstr "генерация нового ключа\n"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr "пропущен штамп создания создания\n"
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Модули RSA пропущены или не имеют размер %d бит\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "отсутствует открытая экспонента RSA или превышает %d бит\n"
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Простое число RSA %s пропущено или не имеет размер %d бит\n"
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 msgid "generating key failed\n"
 msgstr "сбой при генерации ключа\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "ключ сгенерирован (%d секунд)\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "карта не поддерживает функцию хеширования %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "подписей создано: %lu\n"
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка административного PIN в данный момент запрещена этой командой\n"
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
@@ -7552,7 +7557,7 @@ msgstr "ошибка получения сохраненных флагов: %s\
 msgid "error storing flags: %s\n"
 msgstr "ошибка сохранения флагов: %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 #, fuzzy
 msgid "Error - "
 msgstr "[Ошибка - Нет имени]"
@@ -7868,12 +7873,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr "Настройки OCSP"
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/sk.po b/po/sk.po
index 148bad482..172627445 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -91,8 +91,8 @@ msgstr "nespr�vne heslo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -102,10 +102,10 @@ msgstr "nem��em vytvori� `%s': %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1117,7 +1117,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
@@ -3372,20 +3372,20 @@ msgstr "podpisovanie zlyhalo: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
@@ -3402,7 +3402,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
@@ -4201,12 +4201,12 @@ msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
@@ -4346,7 +4346,7 @@ msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4362,7 +4362,7 @@ msgstr ""
 "      <n>m = doba platnosti k���a skon�� za n mesiacov\n"
 "      <n>y = doba platnosti k���a skon�� za n rokov\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4378,40 +4378,40 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n mesiacov\n"
 "      <n>y = doba platnosti podpisu skon�� za n rokov\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "K��� je platn� na? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� na? (0) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnos� %s skon�� %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4419,19 +4419,19 @@ msgstr ""
 "V� syst�m nevie zobrazi� d�tumy po roku 2038.\n"
 "V ka�dom pr�pade bud� d�tumy korektne spracov�van� do roku 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vne (a/n)? "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 #, fuzzy
 msgid ""
 "\n"
@@ -4448,44 +4448,44 @@ msgstr ""
 "    \"Jozko Mrkvicka (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve mene\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Meno nem��e za��na� ��slicou\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Koment�r: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment�ri\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��vate znakov� sadu `%s'.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4496,7 +4496,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
 
@@ -4511,23 +4511,23 @@ msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (U)kon�i�? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (P)okra�ova�/(U)kon�i�? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Najsk�r, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4535,12 +4535,12 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4552,7 +4552,7 @@ msgstr ""
 "tohto programu s parametrom \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4564,50 +4564,50 @@ msgstr ""
 "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Vytv�ranie k���a bolo zru�en�.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujem verejn� k��� do `%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor verejn�ch k���ov (pubring): %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor tajn�ch k���ov (secring): %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru verejn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4616,12 +4616,12 @@ msgstr ""
 "Tento k��� nem��e by� pou�it� na �ifrovanie. Pre vytvorenie\n"
 "sekund�rneho k���a na tento ��el m��ete pou�i� pr�kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4629,7 +4629,7 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4637,26 +4637,26 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvorenie podk���a pre k���e v3 nie je v s�lade s OpenPGP\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
@@ -6145,12 +6145,12 @@ msgstr "chyba pri ��tan�: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�za d�very: synchroniz�cia zlyhala %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "z�znam v datab�ze d�very %lu: lseek() sa nepodaril: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "z�znam v datab�ze d�very %lu: z�pis sa nepodaril (n=%d): %s\n"
@@ -6194,82 +6194,82 @@ msgstr "%s: vytvoren� neplatn� datab�za d�very\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: datab�za d�very vytvoren�\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "POZN�MKA: do trustdb nemo�no zapisova�\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatn� datab�ze d�very\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba pri aktualiz�cii z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba pri ��tan� z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba pri z�pise z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "datab�ze d�very: proced�ra lseek() zlyhala: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nie je s�bor datab�zy d�very\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: z�znam verzie s ��slom %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatn� verzia s�boru %d\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: chyba pri z�pise adres�rov�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulovanie z�znamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: pridanie z�znamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "datab�za d�very je po�koden�; pros�m spustite \"gpg --fix-trustdb\".\n"
 
@@ -6621,12 +6621,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6638,98 +6638,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "zmeni� heslo"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "zmeni� heslo"
@@ -6737,103 +6742,103 @@ msgstr "zmeni� heslo"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 #, fuzzy
 msgid "generating new key\n"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
@@ -7805,7 +7810,7 @@ msgstr "chyba pri vytv�ran� hesla: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -8121,12 +8126,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index bb38c806e..8970f1ded 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg trunk\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-07-20 13:14+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2008-07-21 09:04+0200\n"
 "Last-Translator: Daniel Nylander <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -33,22 +33,29 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../agent/call-pinentry.c:225
+#: agent/call-pinentry.c:225
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
 
-#: ../agent/call-pinentry.c:594
-msgid "Please enter your PIN, so that the secret key can be unlocked for this session"
-msgstr "Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här sessionen"
+#: agent/call-pinentry.c:594
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
+"Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
+"sessionen"
 
-#: ../agent/call-pinentry.c:597
-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:597
+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"
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: ../agent/call-pinentry.c:632
+#: agent/call-pinentry.c:632
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -58,7 +65,7 @@ msgstr "Kvalitet:"
 #. length of the tooltip is limited to about 900 characters.
 #. If you do not translate this entry, a default english
 #. text (see source) will be used.
-#: ../agent/call-pinentry.c:655
+#: agent/call-pinentry.c:655
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Denna rad indikerar kvaliteten för ovan angiven lösenfras.\n"
@@ -67,258 +74,233 @@ msgstr ""
 "och specialtecken. Fråga din administratör om mer exakt information hur\n"
 "man anger säkra lösenfraser."
 
-#. TRANLATORS: The string is appended to an error message in
-#. the pinentry.  The %s is the actual error message, the
-#. two %d give the current and maximum number of tries.
-#: ../agent/call-pinentry.c:697
+#: agent/call-pinentry.c:697
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (försök %d av %d)"
 
-#: ../agent/call-pinentry.c:717
-#: ../agent/call-pinentry.c:729
+#: agent/call-pinentry.c:717 agent/call-pinentry.c:729
 msgid "PIN too long"
 msgstr "PIN-koden är för lång"
 
-#: ../agent/call-pinentry.c:718
+#: agent/call-pinentry.c:718
 msgid "Passphrase too long"
 msgstr "Lösenfrasen är för lång"
 
-#: ../agent/call-pinentry.c:726
+#: agent/call-pinentry.c:726
 msgid "Invalid characters in PIN"
 msgstr "Ogiltiga tecken i PIN-kod"
 
-#: ../agent/call-pinentry.c:731
+#: agent/call-pinentry.c:731
 msgid "PIN too short"
 msgstr "PIN-kod för kort"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: ../agent/call-pinentry.c:743
+#: agent/call-pinentry.c:743
 msgid "Bad PIN"
 msgstr "Felaktig PIN-kod"
 
-#: ../agent/call-pinentry.c:744
+#: agent/call-pinentry.c:744
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: ../agent/call-pinentry.c:780
+#: agent/call-pinentry.c:780
 msgid "Passphrase"
 msgstr "Lösenfras"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: ../agent/command-ssh.c:529
+#: agent/command-ssh.c:529
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 
-#: ../agent/command-ssh.c:688
-#: ../g10/exec.c:478
-#: ../g10/gpg.c:1064
-#: ../g10/keygen.c:3213
-#: ../g10/keygen.c:3246
-#: ../g10/keyring.c:1202
-#: ../g10/keyring.c:1506
-#: ../g10/openfile.c:275
-#: ../g10/openfile.c:368
-#: ../g10/sign.c:800
-#: ../g10/sign.c:1109
-#: ../g10/tdbio.c:547
-#: ../jnlib/dotlock.c:311
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: ../agent/command-ssh.c:700
-#: ../common/helpfile.c:47
-#: ../g10/card-util.c:682
-#: ../g10/card-util.c:751
-#: ../g10/dearmor.c:60
-#: ../g10/dearmor.c:107
-#: ../g10/decrypt.c:70
-#: ../g10/encode.c:194
-#: ../g10/encode.c:504
-#: ../g10/gpg.c:1065
-#: ../g10/import.c:193
-#: ../g10/keygen.c:2698
-#: ../g10/keyring.c:1532
-#: ../g10/openfile.c:192
-#: ../g10/openfile.c:353
-#: ../g10/plaintext.c:503
-#: ../g10/sign.c:782
-#: ../g10/sign.c:977
-#: ../g10/sign.c:1093
-#: ../g10/sign.c:1249
-#: ../g10/tdbdump.c:139
-#: ../g10/tdbdump.c:147
-#: ../g10/tdbio.c:551
-#: ../g10/tdbio.c:614
-#: ../g10/verify.c:99
-#: ../g10/verify.c:162
-#: ../sm/gpgsm.c:2077
-#: ../sm/gpgsm.c:2114
-#: ../sm/gpgsm.c:2152
-#: ../sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
+#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: ../agent/command-ssh.c:1615
-#: ../agent/command-ssh.c:1633
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "fel när serienumret hämtades från kortet: %s\n"
 
-#: ../agent/command-ssh.c:1619
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "identifierade kort med serienummer: %s\n"
 
-#: ../agent/command-ssh.c:1624
+#: agent/command-ssh.c:1624
 #, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "fel när nyckel-id för autentisering hämtades från kortet: %s\n"
 
-#: ../agent/command-ssh.c:1644
+#: agent/command-ssh.c:1644
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "ingen lämplig kortnyckel hittades: %s\n"
 
-#: ../agent/command-ssh.c:1694
+#: agent/command-ssh.c:1694
 #, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "skuggning av nyckeln misslyckades: %s\n"
 
-#: ../agent/command-ssh.c:1709
+#: agent/command-ssh.c:1709
 #, c-format
 msgid "error writing key: %s\n"
 msgstr "fel vid skrivning av nyckel: %s\n"
 
-#: ../agent/command-ssh.c:2014
+#: agent/command-ssh.c:2014
 #, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Ange lösenfrasen för ssh-nyckeln%0A  %c"
 
-#: ../agent/command-ssh.c:2342
-#: ../agent/genkey.c:308
-#: ../agent/genkey.c:430
-#: ../agent/protect-tool.c:1197
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
 msgid "Please re-enter this passphrase"
 msgstr "Ange denna lösenfras igen"
 
-#: ../agent/command-ssh.c:2363
+#: agent/command-ssh.c:2363
 #, c-format
-msgid "Please enter a passphrase to protect the received secret key%%0A   %s%%0Awithin gpg-agent's key storage"
-msgstr "Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A   %s%%0Ai  gpg-agents nyckellager"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
+"Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A   %s%%0Ai  "
+"gpg-agents nyckellager"
 
-#. The re-entered one did not match and the user did not
-#. hit cancel.
-#: ../agent/command-ssh.c:2401
-#: ../agent/genkey.c:338
-#: ../agent/genkey.c:461
-#: ../agent/protect-tool.c:1203
-#: ../tools/symcryptrun.c:434
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
-#: ../agent/command-ssh.c:2885
+#: agent/command-ssh.c:2885
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "misslyckades med att skapa flöde från uttag: %s\n"
 
-#: ../agent/divert-scd.c:217
+#: agent/divert-scd.c:217
 msgid "Admin PIN"
 msgstr "Admin PIN-kod"
 
-#: ../agent/divert-scd.c:275
+#: agent/divert-scd.c:275
 msgid "Repeat this PIN"
 msgstr "Upprepa denna PIN-kod"
 
-#: ../agent/divert-scd.c:278
+#: agent/divert-scd.c:278
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-kod repeterades inte korrekt; försök igen"
 
-#: ../agent/divert-scd.c:290
+#: agent/divert-scd.c:290
 #, c-format
 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:106
-#: ../sm/certreqgen-ui.c:284
-#: ../sm/export.c:628
-#: ../sm/export.c:644
-#: ../sm/import.c:525
-#: ../sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 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
+#: 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
+#: agent/genkey.c:151 agent/genkey.c:157
 msgid "Enter new passphrase"
 msgstr "Ange ny lösenfras"
 
-#: ../agent/genkey.c:165
+#: agent/genkey.c:165
 msgid "Take this one anyway"
 msgstr "Ta den här ändå"
 
-#: ../agent/genkey.c:191
+#: agent/genkey.c:191
 #, c-format
-msgid "Warning: You have entered an insecure passphrase.%%0AA passphrase should be at least %u character long."
-msgid_plural "Warning: You have entered an insecure passphrase.%%0AA passphrase should be at least %u characters long."
-msgstr[0] "Varning:  Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras ska vara minst %u tecken lång."
-msgstr[1] "Varning:  Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras ska vara minst %u tecken lång."
-
-#: ../agent/genkey.c:212
+msgid ""
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
+msgid_plural ""
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
+msgstr[0] ""
+"Varning:  Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras ska "
+"vara minst %u tecken lång."
+msgstr[1] ""
+"Varning:  Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras ska "
+"vara minst %u tecken lång."
+
+#: agent/genkey.c:212
 #, c-format
-msgid "Warning: You have entered an insecure passphrase.%%0AA passphrase should contain at least %u digit or%%0Aspecial character."
-msgid_plural "Warning: You have entered an insecure passphrase.%%0AA passphrase should contain at least %u digits or%%0Aspecial characters."
-msgstr[0] "Varning:  Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras ska innehålla minst %u tecken eller%%0Aspecialtecken."
-msgstr[1] "Varning:  Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras ska innehålla minst %u tecken eller%%0Aspecialtecken."
-
-#.
-#: ../agent/genkey.c:235
+msgid ""
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
+msgid_plural ""
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
+msgstr[0] ""
+"Varning:  Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras ska "
+"innehålla minst %u tecken eller%%0Aspecialtecken."
+msgstr[1] ""
+"Varning:  Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras ska "
+"innehålla minst %u tecken eller%%0Aspecialtecken."
+
+#: agent/genkey.c:235
 #, c-format
-msgid "Warning: You have entered an insecure passphrase.%%0AA passphrase may not be a known term or match%%0Acertain pattern."
-msgstr "Varning:  Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras får inte vara ett känd ord eller matcha%%0Avissa mönster."
+msgid ""
+"Warning: You have entered an insecure passphrase.%%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
+msgstr ""
+"Varning:  Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras får "
+"inte vara ett känd ord eller matcha%%0Avissa mönster."
 
-#: ../agent/genkey.c:251
+#: agent/genkey.c:251
 #, c-format
-msgid "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Du har inte angivit en lösenfras!%0AEn tom lösenfras tillåts inte."
 
-#: ../agent/genkey.c:253
+#: agent/genkey.c:253
 #, c-format
-msgid "You have not entered a passphrase - this is in general a bad idea!%0APlease confirm that you do not want to have any protection on your key."
-msgstr "Du har inte angivet en lösenfras - det här är oftast en dålig idé!%0ABekräfta att du inte vill ha något som helst skydd för din nyckel."
+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 ""
+"Du har inte angivet en lösenfras - det här är oftast en dålig idé!%"
+"0ABekräfta att du inte vill ha något som helst skydd för din nyckel."
 
-#: ../agent/genkey.c:262
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr "Ja, skydd behövs inte"
 
 # fel kapitalisering i originalet?
-#: ../agent/genkey.c:306
+#: agent/genkey.c:306
 #, 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:429
+#: agent/genkey.c:429
 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:117
-#: ../agent/preset-passphrase.c:72
-#: ../agent/protect-tool.c:109
-#: ../scd/scdaemon.c:101
-#: ../tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -326,135 +308,109 @@ msgstr ""
 "@Flaggor:\n"
 " "
 
-#: ../agent/gpg-agent.c:119
-#: ../scd/scdaemon.c:103
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: ../agent/gpg-agent.c:120
-#: ../scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#. { oArmor, "armor",     0, N_("create ascii armored output")},
-#. { oArmor, "armour",     0, "@" },
-#. { oOutput, "output",    2, N_("use as output file")},
-#: ../agent/gpg-agent.c:121
-#: ../g10/gpg.c:472
-#: ../g10/gpgv.c:70
-#: ../kbx/kbxutil.c:88
-#: ../scd/scdaemon.c:107
-#: ../sm/gpgsm.c:344
-#: ../tools/gpg-connect-agent.c:66
-#: ../tools/gpgconf.c:77
-#: ../tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "utförlig"
 
-#: ../agent/gpg-agent.c:122
-#: ../g10/gpgv.c:71
-#: ../kbx/kbxutil.c:89
-#: ../scd/scdaemon.c:108
-#: ../sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:345
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: ../agent/gpg-agent.c:123
-#: ../scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: ../agent/gpg-agent.c:124
-#: ../scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: ../agent/gpg-agent.c:125
-#: ../tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: ../agent/gpg-agent.c:130
-#: ../scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
-#: ../agent/gpg-agent.c:131
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr "fånga inte tangentbord och mus"
 
-#: ../agent/gpg-agent.c:132
-#: ../scd/scdaemon.c:120
-#: ../tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "använd en loggfil för servern"
 
-#: ../agent/gpg-agent.c:134
+#: agent/gpg-agent.c:134
 msgid "use a standard location for the socket"
 msgstr "använd en standardplats för uttaget"
 
-#: ../agent/gpg-agent.c:137
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
 
-#: ../agent/gpg-agent.c:140
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: ../agent/gpg-agent.c:141
+#: agent/gpg-agent.c:141
 msgid "do not use the SCdaemon"
 msgstr "använd inte SCdaemon"
 
-#: ../agent/gpg-agent.c:150
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr "ignorera begäran om att ändra TTY"
 
-#: ../agent/gpg-agent.c:152
+#: 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:155
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
 
-#: ../agent/gpg-agent.c:168
+#: 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:170
+#: 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:172
+#: agent/gpg-agent.c:172
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: ../agent/gpg-agent.c:173
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr "aktivera ssh-agent-emulering"
 
-#: ../agent/gpg-agent.c:175
+#: 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:290
-#: ../agent/preset-passphrase.c:94
-#: ../agent/protect-tool.c:146
-#: ../scd/scdaemon.c:207
-#: ../sm/gpgsm.c:574
-#: ../tools/gpg-connect-agent.c:171
-#: ../tools/gpgconf.c:99
-#: ../tools/symcryptrun.c:204
-#: ../tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Rapportera fel till <"
 
-#: ../agent/gpg-agent.c:293
+#: agent/gpg-agent.c:293
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Användning: gpg-agent [flaggor] (-h för hjälp)"
 
-#: ../agent/gpg-agent.c:295
+#: agent/gpg-agent.c:295
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -462,198 +418,157 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: ../agent/gpg-agent.c:330
-#: ../g10/gpg.c:971
-#: ../scd/scdaemon.c:247
-#: ../sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: ../agent/gpg-agent.c:529
-#: ../agent/protect-tool.c:1066
-#: ../kbx/kbxutil.c:428
-#: ../scd/scdaemon.c:342
-#: ../sm/gpgsm.c:974
-#: ../sm/gpgsm.c:977
-#: ../tools/symcryptrun.c:997
-#: ../tools/gpg-check-pattern.c:178
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s är för gammal (behöver %s, har %s)\n"
 
-#: ../agent/gpg-agent.c:628
-#: ../g10/gpg.c:2069
-#: ../scd/scdaemon.c:423
-#: ../sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: ../agent/gpg-agent.c:633
-#: ../agent/gpg-agent.c:1216
-#: ../g10/gpg.c:2073
-#: ../scd/scdaemon.c:428
-#: ../sm/gpgsm.c:1069
-#: ../tools/symcryptrun.c:930
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: ../agent/gpg-agent.c:641
-#: ../g10/gpg.c:2080
-#: ../scd/scdaemon.c:436
-#: ../sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: ../agent/gpg-agent.c:974
-#: ../g10/plaintext.c:140
-#: ../g10/plaintext.c:145
-#: ../g10/plaintext.c:162
+#: agent/gpg-agent.c:974 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:1308
-#: ../agent/gpg-agent.c:1430
-#: ../agent/gpg-agent.c:1434
-#: ../agent/gpg-agent.c:1475
-#: ../agent/gpg-agent.c:1479
-#: ../g10/exec.c:172
-#: ../g10/openfile.c:429
-#: ../scd/scdaemon.c:923
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:923
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: ../agent/gpg-agent.c:1322
-#: ../scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
 msgid "name of socket too long\n"
 msgstr "namnet på uttaget är för långt\n"
 
-#: ../agent/gpg-agent.c:1347
-#: ../scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: ../agent/gpg-agent.c:1356
+#: agent/gpg-agent.c:1356
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "namnet på uttaget \"%s\" är för långt\n"
 
-#: ../agent/gpg-agent.c:1376
+#: agent/gpg-agent.c:1376
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "en gpg-agent är redan igång - startar inte en till\n"
 
 # Jag har valt att inte översätta nonce. Nonce är data eller information som endast används en gång
-#: ../agent/gpg-agent.c:1387
-#: ../scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
 msgid "error getting nonce for the socket\n"
 msgstr "fel vid hämtning av nonce för uttaget\n"
 
-#. We use gpg_strerror here because it allows us to get strings
-#. for some W32 socket error codes.
-#: ../agent/gpg-agent.c:1392
-#: ../scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fel när \"%s\" bands till uttag: %s\n"
 
-#: ../agent/gpg-agent.c:1404
-#: ../scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() misslyckades: %s\n"
 
-#: ../agent/gpg-agent.c:1410
-#: ../scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "lyssnar på uttaget \"%s\"\n"
 
-#: ../agent/gpg-agent.c:1438
-#: ../agent/gpg-agent.c:1485
-#: ../g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: ../agent/gpg-agent.c:1491
+#: agent/gpg-agent.c:1491
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() misslyckades för \"%s\": %s\n"
 
-#: ../agent/gpg-agent.c:1495
+#: agent/gpg-agent.c:1495
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan inte använda \"%s\" som hemkatalog\n"
 
-#: ../agent/gpg-agent.c:1612
-#: ../scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fel vid läsning av nonce på fd %d: %s\n"
 
-#: ../agent/gpg-agent.c:1634
+#: agent/gpg-agent.c:1634
 #, 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:1639
+#: agent/gpg-agent.c:1639
 #, 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:1659
+#: agent/gpg-agent.c:1659
 #, 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:1664
+#: agent/gpg-agent.c:1664
 #, 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:1781
-#: ../scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select misslyckades: %s - väntar 1 s\n"
 
-#: ../agent/gpg-agent.c:1894
-#: ../scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: ../agent/gpg-agent.c:1917
+#: agent/gpg-agent.c:1917
 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:1928
-#: ../common/simple-pwquery.c:349
-#: ../common/asshelp.c:324
-#: ../tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: ../agent/gpg-agent.c:1941
-#: ../common/simple-pwquery.c:361
-#: ../common/asshelp.c:336
-#: ../tools/gpg-connect-agent.c:2043
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent protokoll version %d stöds inte\n"
 
 # KEYGRIP är ett hexadecimalt värde som representerar hashen för den publika nyckeln
-#: ../agent/preset-passphrase.c:98
+#: agent/preset-passphrase.c:98
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
-msgstr "Användning: gpg-preset-passphrase [flaggor] NYCKELHASH (-h för hjälp)\n"
+msgstr ""
+"Användning: gpg-preset-passphrase [flaggor] NYCKELHASH (-h för hjälp)\n"
 
-#: ../agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -661,11 +576,11 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
 "Underhåll av lösenordscache\n"
 
-#: ../agent/protect-tool.c:149
+#: agent/protect-tool.c:149
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Användning: gpg-protect-tool [flaggor] (-h för hjälp)\n"
 
-#: ../agent/protect-tool.c:151
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -673,19 +588,22 @@ msgstr ""
 "Syntax: gpg-protect-tool [flaggor] [argument]\n"
 "Underhållsverktyg för hemliga nycklar\n"
 
-#: ../agent/protect-tool.c:1188
+#: agent/protect-tool.c:1188
 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:1191
+#: agent/protect-tool.c:1191
 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:1194
-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:1194
+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:1199
+#: agent/protect-tool.c:1199
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -693,68 +611,55 @@ msgstr ""
 "Ange lösenfrasen eller PIN-koden som\n"
 "behövs för att färdigställa denna åtgärd."
 
-#: ../agent/protect-tool.c:1204
-#: ../tools/symcryptrun.c:435
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Lösenfras:"
 
-#: ../agent/protect-tool.c:1212
-#: ../tools/symcryptrun.c:442
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, 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:1215
-#: ../tools/symcryptrun.c:446
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 msgid "cancelled\n"
 msgstr "avbruten\n"
 
-#: ../agent/trustlist.c:132
-#: ../agent/trustlist.c:322
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "fel vid öppnandet av \"%s\": %s\n"
 
-#: ../agent/trustlist.c:147
-#: ../common/helpfile.c:63
-#: ../common/helpfile.c:79
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fil \"%s\", rad %d: %s\n"
 
-#. Same file.
-#: ../agent/trustlist.c:167
-#: ../agent/trustlist.c:175
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr "uttrycket \"%s\" ignorerat i \"%s\", rad %d\n"
 
-#. A non existent system trustlist is not an error.
-#. Just print a note.
-#: ../agent/trustlist.c:181
+#: agent/trustlist.c:181
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "systemets tillitslista \"%s\" är inte tillgänglig\n"
 
-#: ../agent/trustlist.c:216
+#: agent/trustlist.c:216
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "felaktigt fingeravtryck i \"%s\", rad %d\n"
 
-#: ../agent/trustlist.c:242
-#: ../agent/trustlist.c:249
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
 
-#: ../agent/trustlist.c:283
-#: ../common/helpfile.c:126
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "fel vid läsning av \"%s\", rad %d: %s\n"
 
-#: ../agent/trustlist.c:384
-#: ../agent/trustlist.c:431
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 
@@ -767,15 +672,19 @@ msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as stored in the certificate.
-#: ../agent/trustlist.c:541
+#: agent/trustlist.c:541
 #, c-format
-msgid "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the fingerprint:%%0A  %s"
-msgstr "Validera att certifikatet identifierat som:%%0A  \"%s\"%%0Ahar fingeravtrycket:%%0A  %s"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
+msgstr ""
+"Validera att certifikatet identifierat som:%%0A  \"%s\"%%0Ahar "
+"fingeravtrycket:%%0A  %s"
 
 #. 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:554
+#: agent/trustlist.c:554
 msgid "Correct"
 msgstr "Korrekt"
 
@@ -787,617 +696,585 @@ 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:577
+#: agent/trustlist.c:577
 #, c-format
-msgid "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user certificates?"
-msgstr "Litar du förbehållslöst på%%0A  \"%s\"%%0Aatt korrekt certifiera användarcertifikat?"
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
+msgstr ""
+"Litar du förbehållslöst på%%0A  \"%s\"%%0Aatt korrekt certifiera "
+"användarcertifikat?"
 
-#: ../agent/trustlist.c:587
+#: agent/trustlist.c:587
 msgid "Yes"
 msgstr "Ja"
 
-#: ../agent/trustlist.c:587
+#: agent/trustlist.c:587
 msgid "No"
 msgstr "Nej"
 
-#. No protection date known - must force passphrase change.
-#: ../agent/findkey.c:158
+#: agent/findkey.c:158
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
-msgstr "Observera: Den här lösenfrasen har aldrig blivit ändrad.%0ADu bör ändra den nu."
+msgstr ""
+"Observera: Den här lösenfrasen har aldrig blivit ändrad.%0ADu bör ändra den "
+"nu."
 
-#: ../agent/findkey.c:174
+#: agent/findkey.c:174
 #, c-format
-msgid "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change it now."
-msgstr "Den här lösenfrasen har inte ändrats%%0Asedan %.4s-%.2s-%.2s.  Du bör ändra den nu."
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+"Den här lösenfrasen har inte ändrats%%0Asedan %.4s-%.2s-%.2s.  Du bör ändra "
+"den nu."
 
-#: ../agent/findkey.c:188
-#: ../agent/findkey.c:195
+#: agent/findkey.c:188 agent/findkey.c:195
 msgid "Change passphrase"
 msgstr "ändra lösenfras"
 
-#: ../agent/findkey.c:196
+#: agent/findkey.c:196
 msgid "I'll change it later"
 msgstr "Jag ändrar den senare"
 
-#: ../common/exechelp.c:378
-#: ../common/exechelp.c:467
-#: ../tools/gpgconf-comp.c:1406
-#: ../tools/gpgconf-comp.c:1745
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
 #, 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:443
-#: ../common/exechelp.c:500
+#: common/exechelp.c:443 common/exechelp.c:500
 #, 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:479
-#: ../common/exechelp.c:607
-#: ../common/exechelp.c:842
+#: common/exechelp.c:479 common/exechelp.c:607 common/exechelp.c:842
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fel vid grening av process: %s\n"
 
-#: ../common/exechelp.c:653
-#: ../common/exechelp.c:706
+#: common/exechelp.c:653 common/exechelp.c:706
 #, 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:661
+#: common/exechelp.c:661
 #, 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:667
-#: ../common/exechelp.c:717
+#: common/exechelp.c:667 common/exechelp.c:717
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
 
-#: ../common/exechelp.c:712
+#: common/exechelp.c:712
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
 
-#: ../common/exechelp.c:725
+#: common/exechelp.c:725
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fel vid körning av \"%s\": avslutades\n"
 
-#: ../common/http.c:1634
+#: common/http.c:1634
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr "fel när uttag skapades: %s\n"
 
-#: ../common/http.c:1678
+#: common/http.c:1678
 msgid "host not found"
 msgstr "värden hittades inte"
 
-#: ../common/simple-pwquery.c:335
+#: common/simple-pwquery.c:335
 msgid "gpg-agent is not available in this session\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
-#: ../common/simple-pwquery.c:393
+#: common/simple-pwquery.c:393
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: ../common/simple-pwquery.c:404
+#: common/simple-pwquery.c:404
 msgid "communication problem with gpg-agent\n"
 msgstr "kommunikationsproblem med gpg-agent\n"
 
-#: ../common/simple-pwquery.c:414
+#: common/simple-pwquery.c:414
 msgid "problem setting the gpg-agent options\n"
 msgstr "inställningsproblem för gpg-agent\n"
 
-#: ../common/simple-pwquery.c:577
-#: ../common/simple-pwquery.c:673
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
 msgid "canceled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: ../common/simple-pwquery.c:592
-#: ../common/simple-pwquery.c:679
+#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
 msgid "problem with the agent\n"
 msgstr "problem med agenten\n"
 
-#: ../common/sysutils.c:105
+#: common/sysutils.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte stänga av minnesutskrifter: %s\n"
 
-#: ../common/sysutils.c:200
+#: common/sysutils.c:200
 #, 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:232
+#: common/sysutils.c:232
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../common/yesno.c:31
-#: ../common/yesno.c:68
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "ja"
 
-#: ../common/yesno.c:32
-#: ../common/yesno.c:73
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../common/yesno.c:34
-#: ../common/yesno.c:70
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "nej"
 
-#: ../common/yesno.c:35
-#: ../common/yesno.c:74
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../common/yesno.c:72
+#: common/yesno.c:72
 msgid "quit"
 msgstr "avsluta"
 
-#: ../common/yesno.c:75
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "aA"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../common/yesno.c:109
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr "okay|okej|ok"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../common/yesno.c:111
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr "avbryt|stoppa"
 
-#: ../common/yesno.c:112
+#: common/yesno.c:112
 msgid "oO"
 msgstr "oO"
 
-#: ../common/yesno.c:113
+#: common/yesno.c:113
 msgid "cC"
 msgstr "aAsS"
 
-#: ../common/miscellaneous.c:71
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr "slut på kärna i säkert minne vid allokering av %lu byte"
 
-#: ../common/miscellaneous.c:74
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr "slut på kärna vid allokering av %lu byte"
 
-#: ../common/asshelp.c:242
+#: common/asshelp.c:242
 msgid "no running gpg-agent - starting one\n"
 msgstr "ingen körande gpg-agent - startar en\n"
 
-#: ../common/asshelp.c:347
+#: common/asshelp.c:347
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "kan inte ansluta till agenten - försöker falla tillbaka\n"
 
-#: ../common/audit.c:682
+#: common/audit.c:682
 msgid "Certificate chain available"
 msgstr "Certifikatkedja tillgänglig"
 
-#: ../common/audit.c:689
+#: common/audit.c:689
 msgid "root certificate missing"
 msgstr "rotcertifikatet saknas"
 
-#: ../common/audit.c:715
+#: common/audit.c:715
 msgid "Data encryption succeeded"
 msgstr "Datakryptering lyckades"
 
-#: ../common/audit.c:720
-#: ../common/audit.c:781
-#: ../common/audit.c:801
-#: ../common/audit.c:825
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
 msgid "Data available"
 msgstr "Data tillgängligt"
 
-#: ../common/audit.c:723
+#: common/audit.c:723
 msgid "Session key created"
 msgstr "Sessionsnyckel skapad"
 
-#: ../common/audit.c:728
+#: common/audit.c:728
 #, c-format
 msgid "algorithm: %s"
 msgstr "algoritm: %s"
 
-#: ../common/audit.c:730
-#: ../common/audit.c:732
+#: common/audit.c:730 common/audit.c:732
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algoritmen stöds inte: %s"
 
-#: ../common/audit.c:734
+#: common/audit.c:734
 msgid "seems to be not encrypted"
 msgstr "verkar inte vara krypterat"
 
-#: ../common/audit.c:740
+#: common/audit.c:740
 msgid "Number of recipients"
 msgstr "Antal mottagare"
 
-#: ../common/audit.c:748
+#: common/audit.c:748
 #, c-format
 msgid "Recipient %d"
 msgstr "Mottagare %d"
 
-#: ../common/audit.c:776
+#: common/audit.c:776
 msgid "Data signing succeeded"
 msgstr "Datasignering lyckades"
 
-#: ../common/audit.c:796
+#: common/audit.c:796
 msgid "Data decryption succeeded"
 msgstr "Datadekryptering lyckades"
 
-#: ../common/audit.c:821
+#: common/audit.c:821
 msgid "Data verification succeeded"
 msgstr "Datavalidering lyckades"
 
-#: ../common/audit.c:830
+#: common/audit.c:830
 msgid "Signature available"
 msgstr "Signatur tillgänglig"
 
-#: ../common/audit.c:835
+#: common/audit.c:835
 msgid "Parsing signature succeeded"
 msgstr "Tolkning av signatur lyckades"
 
-#: ../common/audit.c:840
+#: common/audit.c:840
 #, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "Felaktig hashalgoritm: %s"
 
-#: ../common/audit.c:855
+#: common/audit.c:855
 #, c-format
 msgid "Signature %d"
 msgstr "Signatur %d"
 
-#: ../common/audit.c:871
+#: common/audit.c:871
 msgid "Certificate chain valid"
 msgstr "Certifikatkedjan är giltig"
 
-#: ../common/audit.c:882
+#: common/audit.c:882
 msgid "Root certificate trustworthy"
 msgstr "rotcertifikatet är pålitligt"
 
-#. Show result of the CRL/OCSP check.
-#: ../common/audit.c:892
+#: common/audit.c:892
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP-kontroll av certifikat"
 
-#: ../common/audit.c:909
+#: common/audit.c:909
 msgid "Included certificates"
 msgstr "Inkluderade certifikat"
 
-#: ../common/audit.c:968
+#: common/audit.c:968
 msgid "No audit log entries."
 msgstr "Inga poster i granskningslogg."
 
-#: ../common/audit.c:1017
+#: common/audit.c:1017
 msgid "Unknown operation"
 msgstr "Okänd åtgärd"
 
-#: ../common/audit.c:1035
+#: common/audit.c:1035
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent användbar"
 
-#: ../common/audit.c:1045
+#: common/audit.c:1045
 msgid "Dirmngr usable"
 msgstr "Dirmngr användbar"
 
-#: ../common/audit.c:1081
+#: common/audit.c:1081
 #, c-format
 msgid "No help available for `%s'."
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\"."
 
-#: ../common/helpfile.c:80
+#: common/helpfile.c:80
 msgid "ignoring garbage line"
 msgstr "ignorerar skräprad"
 
-#: ../g10/armor.c:379
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-skal: %s\n"
 
-#: ../g10/armor.c:418
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "ogiltig rubrikrad i ASCII-skalet: "
 
-#: ../g10/armor.c:429
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "ASCII-skal: "
 
-#: ../g10/armor.c:442
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "ogiltig rubrikrad i klartextsignatur\n"
 
-#. Section 6.2: "Unknown keys should be reported to the user,
-#. but OpenPGP should continue to process the message."  Note
-#. that in a clearsigned message this applies to the signature
-#. part (i.e. "BEGIN PGP SIGNATURE") and not the signed data
-#. ("BEGIN PGP SIGNED MESSAGE").  The only key allowed in the
-#. signed data section is "Hash".
-#: ../g10/armor.c:455
+#: g10/armor.c:455
 msgid "unknown armor header: "
 msgstr "okänt ASCII-skalhuvud: "
 
-#: ../g10/armor.c:508
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "flera klartextsignaturer går in i varandra\n"
 
-#: ../g10/armor.c:643
+#: g10/armor.c:643
 msgid "unexpected armor: "
 msgstr "oväntat skal: "
 
 # rader i klartexten som inleds med bindestreck får ett extra bindestreck vid klartextsignatur (för att lättare hitta "---- Begin ..."
-#. Bad dash-escaping.
-#: ../g10/armor.c:655
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "ogiltig rad som börjar med bindestreck: "
 
 # överhoppad eller hoppades över?
-#: ../g10/armor.c:809
-#: ../g10/armor.c:1419
+#: g10/armor.c:809 g10/armor.c:1419
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ogiltigt radix64-tecken %02X hoppades över\n"
 
 # CRC Cyclic Redundancy Checksum används för att upptäcka fel i ascii-skalet. Används allmänt, trots att det inte höjer säkerheten.
-#: ../g10/armor.c:852
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "för tidigt filslut (ingen CRC-summa)\n"
 
-#: ../g10/armor.c:886
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "för tidigt filslut (i CRC-summan)\n"
 
-#: ../g10/armor.c:894
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "felformaterad CRC-summa\n"
 
-#: ../g10/armor.c:898
-#: ../g10/armor.c:1456
+#: g10/armor.c:898 g10/armor.c:1456
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-fel; %06lX - %06lX\n"
 
-#: ../g10/armor.c:918
+#: g10/armor.c:918
 msgid "premature eof (in trailer)\n"
 msgstr "för tidigt filslut (i den avslutande raden)\n"
 
-#: ../g10/armor.c:922
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "fel i avslutande rad\n"
 
-#: ../g10/armor.c:1233
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: ../g10/armor.c:1238
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ogiltigt ASCII-skal: raden är längre än %d tecken\n"
 
-#: ../g10/armor.c:1242
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+#: g10/armor.c:1242
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
-"tecken kodade enligt \"quoted printable\"-standarden hittades i skalet - detta\n"
-"beror sannolikt på att en felaktig e-postserver eller e-postklient har använts\n"
+"tecken kodade enligt \"quoted printable\"-standarden hittades i skalet - "
+"detta\n"
+"beror sannolikt på att en felaktig e-postserver eller e-postklient har "
+"använts\n"
 
-#: ../g10/build-packet.c:976
-msgid "a notation name must have only printable characters or spaces, and end with an '='\n"
-msgstr "ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och sluta med ett \"'=\"\n"
+#: g10/build-packet.c:976
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och "
+"sluta med ett \"'=\"\n"
 
-#: ../g10/build-packet.c:988
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "en användares notationsnamn måste innehåller tecknet \"@\"\n"
 
-#: ../g10/build-packet.c:994
+#: g10/build-packet.c:994
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "ett notationsnamn får inte innehålla fler än ett \"@\"-tecken\n"
 
-#: ../g10/build-packet.c:1012
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde får inte använda några styrtecken\n"
 
-#: ../g10/build-packet.c:1046
-#: ../g10/build-packet.c:1055
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#: ../g10/build-packet.c:1077
-#: ../g10/build-packet.c:1079
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "inte läsbart"
 
-#: ../g10/card-util.c:62
-#: ../g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:310
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
 
-#: ../g10/card-util.c:67
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kort nr. %s identifierades\n"
 
-#. We don't yet support unattended key generation.
-#: ../g10/card-util.c:75
-#: ../g10/card-util.c:1396
-#: ../g10/delkey.c:126
-#: ../g10/keyedit.c:1529
-#: ../g10/keygen.c:2889
-#: ../g10/revoke.c:216
-#: ../g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i satsläge\n"
 
-#: ../g10/card-util.c:102
-#: ../g10/card-util.c:1129
-#: ../g10/card-util.c:1208
-#: ../g10/keyedit.c:424
-#: ../g10/keyedit.c:445
-#: ../g10/keyedit.c:459
-#: ../g10/keygen.c:1592
-#: ../g10/keygen.c:1659
-#: ../sm/certreqgen-ui.c:128
-#: ../sm/certreqgen-ui.c:182
+#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: ../g10/card-util.c:220
-#: ../g10/card-util.c:270
+#: g10/card-util.c:220 g10/card-util.c:270
 msgid "[not set]"
 msgstr "[inte inställt]"
 
-#: ../g10/card-util.c:417
+#: g10/card-util.c:417
 msgid "male"
 msgstr "man"
 
-#: ../g10/card-util.c:418
+#: g10/card-util.c:418
 msgid "female"
 msgstr "kvinna"
 
-#: ../g10/card-util.c:418
+#: g10/card-util.c:418
 msgid "unspecified"
 msgstr "ej angiven"
 
-#: ../g10/card-util.c:445
+#: g10/card-util.c:445
 msgid "not forced"
 msgstr "inte tvingad"
 
-#: ../g10/card-util.c:445
+#: g10/card-util.c:445
 msgid "forced"
 msgstr "tvingad"
 
-#: ../g10/card-util.c:523
+#: g10/card-util.c:523
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fel: Endast ren ASCII tillåts för närvarande.\n"
 
-#: ../g10/card-util.c:525
+#: g10/card-util.c:525
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fel: Tecknet \"<\" får inte användas.\n"
 
-#: ../g10/card-util.c:527
+#: g10/card-util.c:527
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fel: Dubbla blanksteg tillåts inte.\n"
 
-#: ../g10/card-util.c:544
+#: g10/card-util.c:544
 msgid "Cardholder's surname: "
 msgstr "Kortinnehavarens efternamn: "
 
-#: ../g10/card-util.c:546
+#: g10/card-util.c:546
 msgid "Cardholder's given name: "
 msgstr "Kortinnehavarens förnamn: "
 
-#: ../g10/card-util.c:564
+#: g10/card-util.c:564
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Fel: Fullständigt namn för långt (gränsen är %d tecken).\n"
 
-#: ../g10/card-util.c:585
+#: g10/card-util.c:585
 msgid "URL to retrieve public key: "
 msgstr "Url för att hämta publik nyckel: "
 
-#: ../g10/card-util.c:593
+#: g10/card-util.c:593
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fel: URL:en är för lång (gränsen är %d tecken).\n"
 
-#: ../g10/card-util.c:691
-#: ../g10/card-util.c:760
-#: ../g10/import.c:283
+#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: ../g10/card-util.c:699
+#: g10/card-util.c:699
 msgid "Login data (account name): "
 msgstr "Inloggningsdata (kontonamn): "
 
-#: ../g10/card-util.c:709
+#: g10/card-util.c:709
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fel: Inloggningsdata är för långt (gräns är %d tecken).\n"
 
-#: ../g10/card-util.c:768
+#: g10/card-util.c:768
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: ../g10/card-util.c:778
+#: g10/card-util.c:778
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fel: Privat DO för långt (gränsen är %d tecken).\n"
 
-#: ../g10/card-util.c:798
+#: g10/card-util.c:798
 msgid "Language preferences: "
 msgstr "Språkinställningar: "
 
-#: ../g10/card-util.c:806
+#: g10/card-util.c:806
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fel: ogiltig längd på inställningssträngen\n"
 
-#: ../g10/card-util.c:815
+#: g10/card-util.c:815
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
 
-#: ../g10/card-util.c:836
+#: g10/card-util.c:836
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): "
 
-#: ../g10/card-util.c:850
+#: g10/card-util.c:850
 msgid "Error: invalid response.\n"
 msgstr "Fel: ogiltigt svar.\n"
 
-#: ../g10/card-util.c:871
+#: g10/card-util.c:871
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtryck: "
 
-#: ../g10/card-util.c:894
+#: g10/card-util.c:894
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
 
-#: ../g10/card-util.c:942
+#: g10/card-util.c:942
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nyckelåtgärden är inte möjlig: %s\n"
 
-#: ../g10/card-util.c:943
+#: g10/card-util.c:943
 msgid "not an OpenPGP card"
 msgstr "inte ett OpenPGP-kort"
 
-#: ../g10/card-util.c:952
+#: g10/card-util.c:952
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
 
-#: ../g10/card-util.c:1036
+#: g10/card-util.c:1036
 msgid "Replace existing key? (y/N) "
 msgstr "Ersätt existerande nyckel? (j/N) "
 
-#: ../g10/card-util.c:1056
-#: ../g10/card-util.c:1065
+#: g10/card-util.c:1056 g10/card-util.c:1065
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Skapa säkerhetskopia av krypteringsnyckel utanför kortet? (J/n) "
 
-#: ../g10/card-util.c:1077
+#: g10/card-util.c:1077
 msgid "Replace existing keys? (y/N) "
 msgstr "Ersätt existerande nycklar? (j/N) "
 
-#: ../g10/card-util.c:1086
+#: g10/card-util.c:1086
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1408,468 +1285,439 @@ msgstr ""
 "   PIN-kod = \"%s\"     Admin PIN-kod = \"%s\"\n"
 "Du bör ändra dem med kommandot --change-pin\n"
 
-#: ../g10/card-util.c:1120
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "Välj vilken typ av nyckel som ska genereras:\n"
 
-#: ../g10/card-util.c:1122
-#: ../g10/card-util.c:1199
+#: g10/card-util.c:1122 g10/card-util.c:1199
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: ../g10/card-util.c:1123
-#: ../g10/card-util.c:1201
+#: g10/card-util.c:1123 g10/card-util.c:1201
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: ../g10/card-util.c:1124
-#: ../g10/card-util.c:1203
+#: g10/card-util.c:1124 g10/card-util.c:1203
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#. Okay.
-#: ../g10/card-util.c:1140
-#: ../g10/card-util.c:1219
-#: ../g10/keyedit.c:945
-#: ../g10/keygen.c:1596
-#: ../g10/keygen.c:1624
-#: ../g10/keygen.c:1698
-#: ../g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ogiltigt val.\n"
 
-#: ../g10/card-util.c:1196
+#: g10/card-util.c:1196
 msgid "Please select where to store the key:\n"
 msgstr "Välj var nyckeln ska sparas:\n"
 
-#: ../g10/card-util.c:1231
+#: g10/card-util.c:1231
 msgid "unknown key protection algorithm\n"
 msgstr "okänd nyckelskyddsalgoritm\n"
 
-#: ../g10/card-util.c:1236
+#: g10/card-util.c:1236
 msgid "secret parts of key are not available\n"
 msgstr "hemliga delar av nyckeln är inte tillgängliga.\n"
 
-#: ../g10/card-util.c:1241
+#: g10/card-util.c:1241
 msgid "secret key already stored on a card\n"
 msgstr "hemlig nyckel redan lagrad på ett kort\n"
 
-#: ../g10/card-util.c:1309
-#: ../g10/keyedit.c:1362
+#: g10/card-util.c:1309 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: ../g10/card-util.c:1311
+#: g10/card-util.c:1311
 msgid "show admin commands"
 msgstr "visa administratörskommandon"
 
-#: ../g10/card-util.c:1312
-#: ../g10/keyedit.c:1365
+#: g10/card-util.c:1312 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: ../g10/card-util.c:1314
+#: g10/card-util.c:1314
 msgid "list all available data"
 msgstr "lista allt tillgängligt data"
 
-#: ../g10/card-util.c:1317
+#: g10/card-util.c:1317
 msgid "change card holder's name"
 msgstr "ändra kortinnehavarens namn"
 
-#: ../g10/card-util.c:1318
+#: g10/card-util.c:1318
 msgid "change URL to retrieve key"
 msgstr "ändra url för att hämta nyckel"
 
-#: ../g10/card-util.c:1319
+#: g10/card-util.c:1319
 msgid "fetch the key specified in the card URL"
 msgstr "hämta nyckel som anges i kortets url"
 
-#: ../g10/card-util.c:1320
+#: g10/card-util.c:1320
 msgid "change the login name"
 msgstr "ändra inloggningsnamnet"
 
 # originalet borde ha ett value
-#: ../g10/card-util.c:1321
+#: g10/card-util.c:1321
 msgid "change the language preferences"
 msgstr "ändra språkinställningarna"
 
-#: ../g10/card-util.c:1322
+#: g10/card-util.c:1322
 msgid "change card holder's sex"
 msgstr "ändra kortinnehavarens kön"
 
-#: ../g10/card-util.c:1323
+#: g10/card-util.c:1323
 msgid "change a CA fingerprint"
 msgstr "ändra ett CA-fingeravtryck"
 
 # den låter skum
-#: ../g10/card-util.c:1324
+#: g10/card-util.c:1324
 msgid "toggle the signature force PIN flag"
 msgstr "växla flagga för att tvinga signatur-PIN-kod"
 
-#: ../g10/card-util.c:1325
+#: g10/card-util.c:1325
 msgid "generate new keys"
 msgstr "generera nya nycklar"
 
-#: ../g10/card-util.c:1326
+#: g10/card-util.c:1326
 msgid "menu to change or unblock the PIN"
 msgstr "meny för att ändra eller avblockera PIN-koden"
 
-#: ../g10/card-util.c:1327
+#: g10/card-util.c:1327
 msgid "verify the PIN and list all data"
 msgstr "validera PIN-koden och lista allt data"
 
-#: ../g10/card-util.c:1447
-#: ../g10/keyedit.c:1634
+#: g10/card-util.c:1447 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Kommando> "
 
-#: ../g10/card-util.c:1485
+#: g10/card-util.c:1485
 msgid "Admin-only command\n"
 msgstr "Kommandon endast för administratör\n"
 
-#: ../g10/card-util.c:1516
+#: g10/card-util.c:1516
 msgid "Admin commands are allowed\n"
 msgstr "Administrationskommandon tillåts\n"
 
-#: ../g10/card-util.c:1518
+#: g10/card-util.c:1518
 msgid "Admin commands are not allowed\n"
 msgstr "Administrationskommandon tillåts inte\n"
 
-#: ../g10/card-util.c:1592
-#: ../g10/keyedit.c:2255
+#: g10/card-util.c:1592 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (prova med \"help\")\n"
 
-#: ../g10/decrypt.c:110
-#: ../g10/encode.c:876
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
 # se förra kommentaren
-#: ../g10/decrypt.c:166
-#: ../g10/gpg.c:3959
-#: ../g10/keyring.c:376
-#: ../g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: ../g10/delkey.c:73
-#: ../g10/export.c:324
-#: ../g10/keyedit.c:3402
-#: ../g10/keyserver.c:1727
-#: ../g10/revoke.c:226
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nyckeln \"%s\" hittades inte: %s\n"
 
-#: ../g10/delkey.c:81
-#: ../g10/export.c:354
-#: ../g10/import.c:2398
-#: ../g10/keyserver.c:1741
-#: ../g10/revoke.c:232
-#: ../g10/revoke.c:477
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2398 g10/keyserver.c:1741
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fel vid läsning av nyckelblock: %s\n"
 
-#: ../g10/delkey.c:127
-#: ../g10/delkey.c:134
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(om du inte anger nyckeln med hjälp av fingeravtrycket)\n"
 
-#: ../g10/delkey.c:133
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "kan inte göra så i satsläge utan \"--yes\"\n"
 
-#: ../g10/delkey.c:145
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Ta bort denna nyckel från nyckelringen? (j/N) "
 
-#: ../g10/delkey.c:153
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Detta är en hemlig nyckel! - verkligen ta bort den? (j/N) "
 
-#: ../g10/delkey.c:163
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: ../g10/delkey.c:173
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "raderat information om ägartillit\n"
 
-#: ../g10/delkey.c:204
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "det finns en hemlig nyckel för denna publika nyckeln \"%s\"!\n"
 
-#: ../g10/delkey.c:206
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "använd flaggan \"--delete-secret-keys\"för att ta bort den först.\n"
 
-#: ../g10/encode.c:226
-#: ../g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel när lösenfras skapades: %s\n"
 
-#: ../g10/encode.c:232
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n"
 
-#: ../g10/encode.c:246
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "använder %s-chiffer\n"
 
-#: ../g10/encode.c:256
-#: ../g10/encode.c:577
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" är redan komprimerad\n"
 
-#: ../g10/encode.c:311
-#: ../g10/encode.c:611
-#: ../g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
 
-#: ../g10/encode.c:485
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr "du kan endast kryptera till RSA-nycklar som är högst 2048 bitar långa i --pgp2-läge\n"
+msgstr ""
+"du kan endast kryptera till RSA-nycklar som är högst 2048 bitar långa i --"
+"pgp2-läge\n"
 
-#: ../g10/encode.c:510
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "läser från \"%s\"\n"
 
-#: ../g10/encode.c:541
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#: g10/encode.c:541
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "kan inte använda IDEA-chiffer för alla nycklar du krypterar till.\n"
 
-#: ../g10/encode.c:559
+#: g10/encode.c:559
 #, c-format
-msgid "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
+"mottagarinställningarna\n"
 
-#: ../g10/encode.c:655
-#: ../g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
-msgid "WARNING: forcing compression algorithm %s (%d) violates recipient preferences\n"
-msgstr "VARNING: tvinga komprimeringsalgoritmen %s (%d) strider mot mottagarinställningarna\n"
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+msgstr ""
+"VARNING: tvinga komprimeringsalgoritmen %s (%d) strider mot "
+"mottagarinställningarna\n"
 
-#: ../g10/encode.c:751
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
+msgstr ""
+"tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
 
-#: ../g10/encode.c:821
-#: ../g10/pkclist.c:812
-#: ../g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:812 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s-läget\n"
 
-#: ../g10/encode.c:848
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad för: \"%s\"\n"
 
-#: ../g10/encr-data.c:92
-#: ../g10/mainproc.c:286
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-krypterad data\n"
 
-#: ../g10/encr-data.c:95
-#: ../g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
 
 # I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas.
-#: ../g10/encr-data.c:133
-#: ../sm/decrypt.c:126
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+#: g10/encr-data.c:133 sm/decrypt.c:126
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VARNING: meddelandet krypterades med en svag nyckel\n"
 "i det symmetriska chiffret.\n"
 
-#: ../g10/encr-data.c:145
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "problem vid hanteringen av krypterat paket\n"
 
-#: ../g10/exec.c:49
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "ingen körning av fjärrprogram stöds\n"
 
 # Behörighet att komma åt inställningarna, tror jag. Inte behörigheter i inställningsfilen.
-#: ../g10/exec.c:313
-msgid "external program calls are disabled due to unsafe options file permissions\n"
+#: g10/exec.c:313
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "anrop av externa program är inaktiverat pga osäkra behörigheter för\n"
 "inställningsfilen\n"
 
-#: ../g10/exec.c:343
+#: g10/exec.c:343
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "denna plattform kräver temporärfiler vid anrop till externa program\n"
 
-#: ../g10/exec.c:421
+#: g10/exec.c:421
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "kunde inte köra programmet \"%s\": %s\n"
 
-#: ../g10/exec.c:424
+#: g10/exec.c:424
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "kunde inte köra skalet \"%s\": %s\n"
 
-#: ../g10/exec.c:509
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systemfel när externa program anropades: %s\n"
 
-#: ../g10/exec.c:520
-#: ../g10/exec.c:586
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "externt program avslutades felaktigt\n"
 
-#: ../g10/exec.c:535
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "kunde inte köra det externa programmet\n"
 
-#: ../g10/exec.c:552
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "kan inte läsa svaret från det externa programmet: %s\n"
 
-#: ../g10/exec.c:597
-#: ../g10/exec.c:604
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) \"%s\": %s\n"
 
-#: ../g10/exec.c:609
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VARNING: kunde inte ta bort temp-katalogen \"%s\": %s\n"
 
-#: ../g10/export.c:61
+#: g10/export.c:61
 msgid "export signatures that are marked as local-only"
 msgstr "exportera signaturer som är märkta som endast lokala"
 
-#: ../g10/export.c:63
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "exportera attribut i användaridentiteter (vanligtvis foto-id)"
 
-#: ../g10/export.c:65
+#: g10/export.c:65
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "exportera spärrnycklar markerade som \"känslig\""
 
-#: ../g10/export.c:67
+#: g10/export.c:67
 msgid "remove the passphrase from exported subkeys"
 msgstr "ta bort lösenfrasen från exporterade undernycklar"
 
-#: ../g10/export.c:69
+#: g10/export.c:69
 msgid "remove unusable parts from key during export"
 msgstr "ta bort oanvändbara delar från nyckeln under exportering"
 
-#: ../g10/export.c:71
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr "ta bort så mycket som möjligt från nyckeln under exportering"
 
-#: ../g10/export.c:73
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr "exportera nycklar i ett S-uttrycksbaserat format"
 
-#: ../g10/export.c:338
+#: g10/export.c:338
 msgid "exporting secret keys not allowed\n"
 msgstr "export av hemliga nycklar tillåts inte\n"
 
-#: ../g10/export.c:367
+#: g10/export.c:367
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "nyckeln %s: inte skyddad - hoppade över\n"
 
-#: ../g10/export.c:375
+#: g10/export.c:375
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %s: nyckel av PGP 2.x-typ - hoppade över\n"
 
-#: ../g10/export.c:386
+#: g10/export.c:386
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "nyckeln %s: nyckelmaterial på kortet - hoppade över\n"
 
-#: ../g10/export.c:537
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr "på väg att exportera en oskyddad undernyckel\n"
 
-#: ../g10/export.c:560
+#: g10/export.c:560
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "misslyckades med att ta bort skydd på undernyckel: %s\n"
 
-#. I hope this warning doesn't confuse people.
-#: ../g10/export.c:584
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VARNING: hemliga nyckeln %s har ingen enkel SK-kontrollsumma\n"
 
-#: ../g10/export.c:633
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: ingenting exporterat\n"
 
-#: ../g10/getkey.c:152
+#: g10/getkey.c:152
 msgid "too many entries in pk cache - disabled\n"
 msgstr "för många poster i pk-cachen - inaktiverad\n"
 
-#: ../g10/getkey.c:175
+#: g10/getkey.c:175
 msgid "[User ID not found]"
 msgstr "[Användaridentiteten hittades inte]"
 
-#. Key found.
-#: ../g10/getkey.c:1111
+#: g10/getkey.c:1111
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "hämtade \"%s\" automatiskt via %s\n"
 
-#: ../g10/getkey.c:1116
+#: g10/getkey.c:1116
 #, c-format
 msgid "error retrieving `%s' via %s: %s\n"
 msgstr "fel vid hämtning av \"%s\" via %s: %s\n"
 
-#: ../g10/getkey.c:1118
+#: g10/getkey.c:1118
 msgid "No fingerprint"
 msgstr "Inget fingeravtryck"
 
-#: ../g10/getkey.c:1928
+#: g10/getkey.c:1928
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
+msgstr ""
+"Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
 
-#: ../g10/getkey.c:2531
-#: ../g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3727
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemlig undernyckel för publika undernyckeln %s - hoppar över\n"
 
-#: ../g10/getkey.c:2762
+#: g10/getkey.c:2762
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 
-#: ../g10/getkey.c:2809
+#: g10/getkey.c:2809
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
 
-#: ../g10/gpg.c:370
-#: ../kbx/kbxutil.c:71
-#: ../sm/gpgsm.c:246
-#: ../tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
 msgid ""
 "@Commands:\n"
 " "
@@ -1877,150 +1725,134 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: ../g10/gpg.c:372
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: ../g10/gpg.c:373
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartextsignatur"
 
-#: ../g10/gpg.c:374
-#: ../sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:250
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: ../g10/gpg.c:375
-#: ../sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:251
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: ../g10/gpg.c:377
-#: ../sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:252
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering endast med symmetriskt chiffer"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: ../g10/gpg.c:379
-#: ../sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:253
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: ../g10/gpg.c:381
-#: ../sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:254
 msgid "verify a signature"
 msgstr "validera en signatur"
 
-#: ../g10/gpg.c:383
-#: ../sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:256
 msgid "list keys"
 msgstr "lista nycklar"
 
-#: ../g10/gpg.c:385
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "lista nycklar och signaturer"
 
-#: ../g10/gpg.c:386
+#: g10/gpg.c:386
 msgid "list and check key signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: ../g10/gpg.c:387
-#: ../sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:260
 msgid "list keys and fingerprints"
 msgstr "lista nycklar och fingeravtryck"
 
-#: ../g10/gpg.c:388
-#: ../sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:258
 msgid "list secret keys"
 msgstr "lista hemliga nycklar"
 
-#: ../g10/gpg.c:389
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: ../g10/gpg.c:390
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den publika nyckelringen"
 
-#: ../g10/gpg.c:392
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: ../g10/gpg.c:393
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: ../g10/gpg.c:394
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: ../g10/gpg.c:395
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: ../g10/gpg.c:396
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: ../g10/gpg.c:398
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: ../g10/gpg.c:399
-#: ../sm/gpgsm.c:263
+#: g10/gpg.c:399 sm/gpgsm.c:263
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: ../g10/gpg.c:400
-#: ../sm/gpgsm.c:264
+#: g10/gpg.c:400 sm/gpgsm.c:264
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: ../g10/gpg.c:402
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: ../g10/gpg.c:404
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: ../g10/gpg.c:409
+#: g10/gpg.c:409
 msgid "import/merge keys"
 msgstr "importera/slå samman nycklar"
 
-#: ../g10/gpg.c:412
+#: g10/gpg.c:412
 msgid "print the card status"
 msgstr "skriv ut kortstatus"
 
-#: ../g10/gpg.c:413
+#: g10/gpg.c:413
 msgid "change data on a card"
 msgstr "ändra data på ett kort"
 
-#: ../g10/gpg.c:414
+#: g10/gpg.c:414
 msgid "change a card's PIN"
 msgstr "ändra PIN-kod för ett kort"
 
-#: ../g10/gpg.c:423
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: ../g10/gpg.c:430
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: ../g10/gpg.c:433
-#: ../sm/gpgsm.c:268
+#: g10/gpg.c:433 sm/gpgsm.c:268
 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:435
-#: ../g10/gpgv.c:68
-#: ../kbx/kbxutil.c:81
-#: ../sm/gpgsm.c:283
-#: ../tools/gpg-connect-agent.c:64
-#: ../tools/gpgconf.c:74
-#: ../tools/symcryptrun.c:157
+#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -2030,59 +1862,49 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: ../g10/gpg.c:437
-#: ../sm/gpgsm.c:285
+#: g10/gpg.c:437 sm/gpgsm.c:285
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: ../g10/gpg.c:439
-#: ../sm/gpgsm.c:297
+#: g10/gpg.c:439 sm/gpgsm.c:297
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: ../g10/gpg.c:450
-#: ../sm/gpgsm.c:335
+#: g10/gpg.c:450 sm/gpgsm.c:335
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: ../g10/gpg.c:451
-#: ../sm/gpgsm.c:338
+#: g10/gpg.c:451 sm/gpgsm.c:338
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
 
-#: ../g10/gpg.c:456
-#: ../sm/gpgsm.c:340
+#: g10/gpg.c:456 sm/gpgsm.c:340
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: ../g10/gpg.c:470
-#: ../sm/gpgsm.c:343
+#: g10/gpg.c:470 sm/gpgsm.c:343
 msgid "|FILE|write output to FILE"
 msgstr "|FIL|skriv utdata till FIL"
 
-#: ../g10/gpg.c:483
-#: ../kbx/kbxutil.c:90
-#: ../sm/gpgsm.c:354
-#: ../tools/gpgconf.c:79
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: ../g10/gpg.c:484
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "fråga innan överskrivning"
 
-#: ../g10/gpg.c:527
+#: g10/gpg.c:527
 msgid "use strict OpenPGP behavior"
 msgstr "använd strikt OpenPGP-beteende"
 
-#: ../g10/gpg.c:528
+#: g10/gpg.c:528
 msgid "generate PGP 2.x compatible messages"
 msgstr "generera PGP 2.x-kompatibla meddelanden"
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: ../g10/gpg.c:557
-#: ../sm/gpgsm.c:403
+#: g10/gpg.c:557 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2090,8 +1912,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: ../g10/gpg.c:560
-#: ../sm/gpgsm.c:406
+#: g10/gpg.c:560 sm/gpgsm.c:406
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2111,19 +1932,18 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: ../g10/gpg.c:760
-#: ../g10/gpgv.c:95
+#: g10/gpg.c:760 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera fel till <[email protected]>\n"
 "Skicka synpunkter på översättningen till <[email protected]>\n"
 
-#: ../g10/gpg.c:777
+#: g10/gpg.c:777
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: ../g10/gpg.c:780
+#: g10/gpg.c:780
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2133,8 +1953,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: ../g10/gpg.c:791
-#: ../sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:587
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2142,593 +1961,592 @@ msgstr ""
 "\n"
 "Algoritmer som stöds:\n"
 
-#: ../g10/gpg.c:794
+#: g10/gpg.c:794
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: ../g10/gpg.c:801
-#: ../g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: ../g10/gpg.c:808
+#: g10/gpg.c:808
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: ../g10/gpg.c:815
-#: ../g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: ../g10/gpg.c:822
-#: ../sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:607
 msgid "Used libraries:"
 msgstr "Använda bibliotek:"
 
-#: ../g10/gpg.c:930
+#: g10/gpg.c:930
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: ../g10/gpg.c:1100
-#: ../sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:772
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: ../g10/gpg.c:1118
+#: g10/gpg.c:1118
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: ../g10/gpg.c:1315
+#: g10/gpg.c:1315
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
 
-#: ../g10/gpg.c:1318
+#: g10/gpg.c:1318
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
 
-#: ../g10/gpg.c:1321
+#: g10/gpg.c:1321
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
 
-#: ../g10/gpg.c:1327
+#: g10/gpg.c:1327
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
 
-#: ../g10/gpg.c:1330
+#: g10/gpg.c:1330
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VARNING: osäkra rättigheter på konfigurationsfilen \"%s\"\n"
 
 # Extension är vad? FIXME
-#: ../g10/gpg.c:1333
+#: g10/gpg.c:1333
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
 
-#: ../g10/gpg.c:1339
+#: g10/gpg.c:1339
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
-msgstr "VARNING: osäkert ägarskap på inneslutande katalog för hemkatalogen \"%s\"\n"
+msgstr ""
+"VARNING: osäkert ägarskap på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: ../g10/gpg.c:1342
+#: g10/gpg.c:1342
 #, c-format
-msgid "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
-msgstr "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen \"%s\"\n"
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
+msgstr ""
+"VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen \"%"
+"s\"\n"
 
-#: ../g10/gpg.c:1345
+#: g10/gpg.c:1345
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
-msgstr "VARNING: osäkert ägarskap på inneslutande katalog för tillägget \"%s\"\n"
+msgstr ""
+"VARNING: osäkert ägarskap på inneslutande katalog för tillägget \"%s\"\n"
 
-#: ../g10/gpg.c:1351
+#: g10/gpg.c:1351
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
-msgstr "VARNING: osäkra rättigheter på inneslutande katalog för hemkatalogen \"%s\"\n"
+msgstr ""
+"VARNING: osäkra rättigheter på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: ../g10/gpg.c:1354
+#: g10/gpg.c:1354
 #, c-format
-msgid "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
-msgstr "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen \"%s\"\n"
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
+msgstr ""
+"VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
+"\"%s\"\n"
 
-#: ../g10/gpg.c:1357
+#: g10/gpg.c:1357
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
-msgstr "VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
+msgstr ""
+"VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
 
-#: ../g10/gpg.c:1536
+#: g10/gpg.c:1536
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: ../g10/gpg.c:1636
+#: g10/gpg.c:1636
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: ../g10/gpg.c:1638
+#: g10/gpg.c:1638
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: ../g10/gpg.c:1640
+#: g10/gpg.c:1640
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: ../g10/gpg.c:1642
+#: g10/gpg.c:1642
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: ../g10/gpg.c:1646
+#: g10/gpg.c:1646
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: ../g10/gpg.c:1648
+#: g10/gpg.c:1648
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: ../g10/gpg.c:1650
+#: g10/gpg.c:1650
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: ../g10/gpg.c:1652
+#: g10/gpg.c:1652
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: ../g10/gpg.c:1654
+#: g10/gpg.c:1654
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: ../g10/gpg.c:1656
+#: g10/gpg.c:1656
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: ../g10/gpg.c:1658
+#: g10/gpg.c:1658
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: ../g10/gpg.c:1817
+#: g10/gpg.c:1817
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: ../g10/gpg.c:1908
+#: g10/gpg.c:1908
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt är för gammalt (behöver %s, har %s)\n"
 
-#: ../g10/gpg.c:2292
-#: ../g10/gpg.c:2976
-#: ../g10/gpg.c:2988
+#: g10/gpg.c:2292 g10/gpg.c:2976 g10/gpg.c:2988
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: ../g10/gpg.c:2473
-#: ../g10/gpg.c:2485
+#: g10/gpg.c:2473 g10/gpg.c:2485
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 
-#: ../g10/gpg.c:2567
+#: g10/gpg.c:2567
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: ../g10/gpg.c:2590
-#: ../g10/gpg.c:2785
-#: ../g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: ../g10/gpg.c:2602
+#: g10/gpg.c:2602
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: ../g10/gpg.c:2605
+#: g10/gpg.c:2605
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: ../g10/gpg.c:2612
+#: g10/gpg.c:2612
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: ../g10/gpg.c:2615
+#: g10/gpg.c:2615
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: ../g10/gpg.c:2622
+#: g10/gpg.c:2622
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: ../g10/gpg.c:2625
+#: g10/gpg.c:2625
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: ../g10/gpg.c:2632
+#: g10/gpg.c:2632
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: ../g10/gpg.c:2635
+#: g10/gpg.c:2635
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: ../g10/gpg.c:2643
+#: g10/gpg.c:2643
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: ../g10/gpg.c:2645
+#: g10/gpg.c:2645
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: ../g10/gpg.c:2647
+#: g10/gpg.c:2647
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: ../g10/gpg.c:2649
+#: g10/gpg.c:2649
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: ../g10/gpg.c:2653
+#: g10/gpg.c:2653
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: ../g10/gpg.c:2655
+#: g10/gpg.c:2655
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: ../g10/gpg.c:2657
+#: g10/gpg.c:2657
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: ../g10/gpg.c:2659
+#: g10/gpg.c:2659
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: ../g10/gpg.c:2661
+#: g10/gpg.c:2661
 msgid "show only the primary user ID in signature verification"
 msgstr "visa endast primär användaridentitet i signaturvalidering"
 
-#: ../g10/gpg.c:2663
+#: g10/gpg.c:2663
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: ../g10/gpg.c:2665
+#: g10/gpg.c:2665
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: ../g10/gpg.c:2672
+#: g10/gpg.c:2672
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: ../g10/gpg.c:2675
+#: g10/gpg.c:2675
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: ../g10/gpg.c:2682
+#: g10/gpg.c:2682
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte ställa in exec-path till %s\n"
 
-#: ../g10/gpg.c:2857
+#: g10/gpg.c:2857
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: ../g10/gpg.c:2860
+#: g10/gpg.c:2860
 msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: ../g10/gpg.c:2965
-#: ../sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: ../g10/gpg.c:2969
+#: g10/gpg.c:2969
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: ../g10/gpg.c:2978
+#: g10/gpg.c:2978
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: ../g10/gpg.c:2981
+#: g10/gpg.c:2981
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: ../g10/gpg.c:2996
+#: g10/gpg.c:2996
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kommer inte att köra med osäkert minne på grund av %s\n"
 
-#: ../g10/gpg.c:3010
+#: g10/gpg.c:3010
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
 "i --pgp2-läge\n"
 
-#: ../g10/gpg.c:3016
+#: g10/gpg.c:3016
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
-#: ../g10/gpg.c:3022
+#: g10/gpg.c:3022
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 
 # IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
-#: ../g10/gpg.c:3035
+#: g10/gpg.c:3035
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n"
 
-#: ../g10/gpg.c:3101
-#: ../g10/gpg.c:3125
-#: ../sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: ../g10/gpg.c:3107
-#: ../g10/gpg.c:3131
-#: ../sm/gpgsm.c:1565
-#: ../sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: ../g10/gpg.c:3113
+#: g10/gpg.c:3113
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: ../g10/gpg.c:3119
+#: g10/gpg.c:3119
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vald algoritm för certifieringssammandrag är felaktig\n"
 
 # antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: ../g10/gpg.c:3134
+#: g10/gpg.c:3134
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
 # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: ../g10/gpg.c:3136
+#: g10/gpg.c:3136
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
 # Hur djupt GnuPG ska leta i Web-of-trust.
-#: ../g10/gpg.c:3138
+#: g10/gpg.c:3138
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth måste vara inom intervallet från 1 till 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: ../g10/gpg.c:3140
+#: g10/gpg.c:3140
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-msgstr "ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
+msgstr ""
+"ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: ../g10/gpg.c:3142
+#: g10/gpg.c:3142
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: ../g10/gpg.c:3145
+#: g10/gpg.c:3145
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: ../g10/gpg.c:3149
+#: g10/gpg.c:3149
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: ../g10/gpg.c:3156
+#: g10/gpg.c:3156
 msgid "invalid default preferences\n"
 msgstr "ogiltiga standardinställningar\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: ../g10/gpg.c:3165
+#: g10/gpg.c:3165
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av personligt chiffer\n"
 
-#: ../g10/gpg.c:3169
+#: g10/gpg.c:3169
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: ../g10/gpg.c:3173
+#: g10/gpg.c:3173
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: ../g10/gpg.c:3206
+#: g10/gpg.c:3206
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: ../g10/gpg.c:3253
+#: g10/gpg.c:3253
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: ../g10/gpg.c:3258
+#: g10/gpg.c:3258
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
-msgstr "du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
+msgstr ""
+"du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: ../g10/gpg.c:3263
+#: g10/gpg.c:3263
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
-msgstr "du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
+msgstr ""
+"du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: ../g10/gpg.c:3355
+#: g10/gpg.c:3355
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: ../g10/gpg.c:3366
+#: g10/gpg.c:3366
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
+msgstr ""
+"VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
 
-#: ../g10/gpg.c:3387
+#: g10/gpg.c:3387
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: ../g10/gpg.c:3394
+#: g10/gpg.c:3394
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: ../g10/gpg.c:3396
+#: g10/gpg.c:3396
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: ../g10/gpg.c:3406
+#: g10/gpg.c:3406
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: ../g10/gpg.c:3419
+#: g10/gpg.c:3419
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: ../g10/gpg.c:3421
+#: g10/gpg.c:3421
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --encrypt med --s2k-mode 0\n"
 
-#: ../g10/gpg.c:3424
+#: g10/gpg.c:3424
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
 
-#: ../g10/gpg.c:3442
+#: g10/gpg.c:3442
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: ../g10/gpg.c:3455
+#: g10/gpg.c:3455
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: ../g10/gpg.c:3470
+#: g10/gpg.c:3470
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: ../g10/gpg.c:3472
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --sign --encrypt med --s2k-mode 0\n"
 
-#: ../g10/gpg.c:3475
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr "du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
+msgstr ""
+"du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
 
-#: ../g10/gpg.c:3495
+#: g10/gpg.c:3495
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: ../g10/gpg.c:3504
+#: g10/gpg.c:3504
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: ../g10/gpg.c:3529
+#: g10/gpg.c:3529
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: ../g10/gpg.c:3537
+#: g10/gpg.c:3537
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: ../g10/gpg.c:3541
+#: g10/gpg.c:3541
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: ../g10/gpg.c:3562
+#: g10/gpg.c:3562
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: ../g10/gpg.c:3654
+#: g10/gpg.c:3654
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: ../g10/gpg.c:3656
+#: g10/gpg.c:3656
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: ../g10/gpg.c:3658
+#: g10/gpg.c:3658
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: ../g10/gpg.c:3669
+#: g10/gpg.c:3669
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: ../g10/gpg.c:3679
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: ../g10/gpg.c:3730
+#: g10/gpg.c:3730
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: ../g10/gpg.c:3738
+#: g10/gpg.c:3738
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: ../g10/gpg.c:3828
+#: g10/gpg.c:3828
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: ../g10/gpg.c:3945
+#: g10/gpg.c:3945
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: ../g10/gpg.c:3949
+#: g10/gpg.c:3949
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: ../g10/gpg.c:4261
+#: g10/gpg.c:4261
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: ../g10/gpg.c:4263
+#: g10/gpg.c:4263
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: ../g10/gpg.c:4296
+#: g10/gpg.c:4296
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
-#: ../g10/gpgv.c:72
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "ta nycklarna från denna nyckelring "
 
 # Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande.
 # Kommandot är avsett att användas i "near online system".
 # Krav från RIPE.
-#: ../g10/gpgv.c:74
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 
-#: ../g10/gpgv.c:75
-#: ../sm/gpgsm.c:377
+#: g10/gpgv.c:75 sm/gpgsm.c:377
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: ../g10/gpgv.c:99
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
 
-#: ../g10/gpgv.c:102
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2736,135 +2554,129 @@ msgstr ""
 "Syntax: gpg [flaggor] [filer]\n"
 "Kontrollera signaturerna mot kända nycklar\n"
 
-#: ../g10/helptext.c:72
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Det finns ingen hjälp tillgänglig"
 
-#: ../g10/helptext.c:82
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
 
-#: ../g10/import.c:94
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr "importera signaturer som är markerade som endast lokala"
 
-#: ../g10/import.c:96
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr "reparera skada från pks-nyckelservern under importering"
 
-#: ../g10/import.c:98
+#: g10/import.c:98
 msgid "do not update the trustdb after import"
 msgstr "uppdatera inte tillitsdatabasen efter importering"
 
-#: ../g10/import.c:100
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr "skapa en publik nyckel när en hemlig nyckel importeras"
 
-#: ../g10/import.c:102
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr "acceptera endast uppdateringar till befintliga nycklar"
 
-#: ../g10/import.c:104
+#: g10/import.c:104
 msgid "remove unusable parts from key after import"
 msgstr "ta bort oanvändbara delar från nyckeln efter importering"
 
-#: ../g10/import.c:106
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr "ta bort så mycket som möjligt från nyckeln efter importering"
 
-#: ../g10/import.c:269
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: ../g10/import.c:278
+#: g10/import.c:278
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu nycklar behandlade än så länge\n"
 
-#: ../g10/import.c:295
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlade enheter: %lu\n"
 
-#: ../g10/import.c:297
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        överhoppade nya nycklar: %lu\n"
 
-#: ../g10/import.c:300
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "       utan användaridentiteter: %lu\n"
 
-#: ../g10/import.c:302
-#: ../sm/import.c:112
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "                    importerade: %lu"
 
-#: ../g10/import.c:308
-#: ../sm/import.c:116
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                    oförändrade: %lu\n"
 
-#: ../g10/import.c:310
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "        nya användaridentiteter: %lu\n"
 
-#: ../g10/import.c:312
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               nya undernycklar: %lu\n"
 
-#: ../g10/import.c:314
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                 nya signaturer: %lu\n"
 
-#: ../g10/import.c:316
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          nya nyckelspärrningar: %lu\n"
 
-#: ../g10/import.c:318
-#: ../sm/import.c:118
+#: 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:120
+#: 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:122
+#: 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:124
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "               inte importerade: %lu\n"
 
-#: ../g10/import.c:326
+#: g10/import.c:326
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "             signaturer rensade: %lu\n"
 
-#: ../g10/import.c:328
+#: g10/import.c:328
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "    användaridentiteter rensade: %lu\n"
 
-#: ../g10/import.c:569
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -2873,446 +2685,424 @@ msgstr ""
 "VARNING: nyckeln %s innehåller inställningar för otillgängliga\n"
 "algoritmer för dessa användaridentiteter:\n"
 
-#: ../g10/import.c:610
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": inställning för chifferalgoritmen %s\n"
 
-#: ../g10/import.c:625
+#: g10/import.c:625
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": inställning för sammandragsalgoritmen %s\n"
 
-#: ../g10/import.c:637
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": inställning för komprimeringsalgoritmen %s\n"
 
-#: ../g10/import.c:650
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "det rekommenderas starkt att du uppdaterar dina inställningar\n"
 
-#: ../g10/import.c:652
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "och distribuerar denna nyckel igen för att undvika tänkbara problem\n"
 "med att algoritmerna inte stämmer\n"
 
-#: ../g10/import.c:676
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
-msgstr "du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
+msgstr ""
+"du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
 
-#: ../g10/import.c:729
-#: ../g10/import.c:1137
+#: g10/import.c:729 g10/import.c:1137
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %s: ingen användaridentitet\n"
 
 # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: ../g10/import.c:758
+#: g10/import.c:758
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nyckeln %s: PKS-skadad undernyckel reparerades\n"
 
 # vad innebär fnutten i slutet?
-#: ../g10/import.c:773
+#: g10/import.c:773
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "nyckel %s: accepterade icke-självsignerad användaridentitet \"%s\"\n"
 
-#: ../g10/import.c:779
+#: g10/import.c:779
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %s: inga giltiga användaridentiteter\n"
 
-#: ../g10/import.c:781
+#: g10/import.c:781
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero på att det saknas en självsignatur\n"
 
-#: ../g10/import.c:791
-#: ../g10/import.c:1259
+#: g10/import.c:791 g10/import.c:1259
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
 
-#: ../g10/import.c:797
+#: g10/import.c:797
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %s: ny nyckel - hoppade över\n"
 
-#: ../g10/import.c:806
+#: g10/import.c:806
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: ../g10/import.c:811
-#: ../g10/openfile.c:278
-#: ../g10/sign.c:804
-#: ../g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: ../g10/import.c:815
-#: ../g10/import.c:910
-#: ../g10/import.c:1177
-#: ../g10/import.c:1320
-#: ../g10/import.c:2412
-#: ../g10/import.c:2434
+#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1320
+#: g10/import.c:2412 g10/import.c:2434
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
 # fixme: I appended the %s -wk
-#: ../g10/import.c:834
+#: g10/import.c:834
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nyckel %s: publika nyckeln \"%s\" importerades\n"
 
-#: ../g10/import.c:858
+#: g10/import.c:858
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nyckel %s: stämmer inte mot vår lokala kopia\n"
 
-#: ../g10/import.c:875
-#: ../g10/import.c:1277
+#: g10/import.c:875 g10/import.c:1277
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nyckel %s: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: ../g10/import.c:883
-#: ../g10/import.c:1284
+#: g10/import.c:883 g10/import.c:1284
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nyckel %s: kan inte läsa det ursprungliga nyckelblocket %s\n"
 
-#: ../g10/import.c:920
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %s: \"%s\" 1 ny användaridentitet\n"
 
-#: ../g10/import.c:923
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nyckel %s: \"%s\" %d nya användaridentiteter\n"
 
-#: ../g10/import.c:926
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %s: \"%s\" 1 ny signatur\n"
 
-#: ../g10/import.c:929
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %s: \"%s\" %d nya signaturer\n"
 
-#: ../g10/import.c:932
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %s: \"%s\" 1 ny undernyckel\n"
 
-#: ../g10/import.c:935
+#: g10/import.c:935
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %s: \"%s\" %d nya undernycklar\n"
 
-#: ../g10/import.c:938
+#: g10/import.c:938
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
 
-#: ../g10/import.c:941
+#: g10/import.c:941
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
 
-#: ../g10/import.c:944
+#: g10/import.c:944
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentitet rensad\n"
 
-#: ../g10/import.c:947
+#: g10/import.c:947
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentiteter rensade\n"
 
-#: ../g10/import.c:971
+#: g10/import.c:971
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %s: \"%s\" inte ändrad\n"
 
-#: ../g10/import.c:1143
+#: g10/import.c:1143
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "nyckel %s: hemlig nyckel med ogiltigt chiffer %d - hoppade över\n"
 
-#. We don't allow to import secret keys because that may be used
-#. to put a secret key into the keyring and the user might later
-#. be tricked into signing stuff with that key.
-#: ../g10/import.c:1154
+#: g10/import.c:1154
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemliga nycklar tillåts inte\n"
 
-#: ../g10/import.c:1171
-#: ../g10/import.c:2427
+#: g10/import.c:1171 g10/import.c:2427
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
-#: ../g10/import.c:1182
+#: g10/import.c:1182
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %s: hemlig nyckel importerades\n"
 
-#. we can't merge secret keys
-#: ../g10/import.c:1212
+#: g10/import.c:1212
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "nyckel %s: finns redan i hemliga nyckelringen\n"
 
-#: ../g10/import.c:1222
+#: g10/import.c:1222
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "nyckel %s: hittade inte hemlig nyckel: %s\n"
 
-#: ../g10/import.c:1252
+#: g10/import.c:1252
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "nyckel %s: ingen publik nyckel - kan inte verkställa spärrcertifikat\n"
 
-#: ../g10/import.c:1295
+#: g10/import.c:1295
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: ../g10/import.c:1327
+#: g10/import.c:1327
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
 
-#: ../g10/import.c:1393
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nyckel %s: ingen användaridentitet för signaturen\n"
 
 # fixme: I appended the %s -wk
-#: ../g10/import.c:1408
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
-msgstr "nyckel %s: algoritmen för publika nycklar stöds inte för användaridentiteten  \"%s\"\n"
+msgstr ""
+"nyckel %s: algoritmen för publika nycklar stöds inte för "
+"användaridentiteten  \"%s\"\n"
 
-#: ../g10/import.c:1410
+#: g10/import.c:1410
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nyckel %s: ogiltig självsignatur på användaridentiteten \"%s\"\n"
 
-#: ../g10/import.c:1428
+#: g10/import.c:1428
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
 
-#: ../g10/import.c:1439
-#: ../g10/import.c:1489
+#: g10/import.c:1439 g10/import.c:1489
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
 
-#: ../g10/import.c:1441
+#: g10/import.c:1441
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %s: ogiltig undernyckelbindning\n"
 
-#: ../g10/import.c:1456
+#: g10/import.c:1456
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
 
-#: ../g10/import.c:1478
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
 
-#: ../g10/import.c:1491
+#: g10/import.c:1491
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
 
-#: ../g10/import.c:1506
+#: g10/import.c:1506
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
 
-#: ../g10/import.c:1548
+#: g10/import.c:1548
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
 
-#: ../g10/import.c:1569
+#: g10/import.c:1569
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %s: hoppade över undernyckel\n"
 
-#: ../g10/import.c:1596
+#: g10/import.c:1596
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "nyckel %s: icke-exporterbar signatur (klass 0x%02X) - hoppade över\n"
 
-#: ../g10/import.c:1606
+#: g10/import.c:1606
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "nyckel %s: spärrcertifikat på fel plats - hoppade över\n"
 
 # nyckeln eller certifikatet??
-#: ../g10/import.c:1623
+#: g10/import.c:1623
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
 
-#: ../g10/import.c:1637
+#: g10/import.c:1637
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "nyckel %s: signatur på undernyckel på fel plats - hoppade över\n"
 
 # nyckeln eller klassen?
-#: ../g10/import.c:1645
+#: g10/import.c:1645
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "nyckel %s: oväntad signaturklass  (0x%02X) - hoppade över\n"
 
-#: ../g10/import.c:1774
+#: g10/import.c:1774
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
+msgstr ""
+"nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
 
-#: ../g10/import.c:1836
+#: g10/import.c:1836
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "VARNING: nyckeln %s kan ha spärrats: hämtar spärrnyckeln %s\n"
 
-#: ../g10/import.c:1850
+#: g10/import.c:1850
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VARNING: nyckeln %s kan ha spärrats: spärrnyckeln %s saknas.\n"
 
-#: ../g10/import.c:1909
+#: g10/import.c:1909
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
 
-#: ../g10/import.c:1943
+#: g10/import.c:1943
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
 
-#: ../g10/import.c:2332
+#: g10/import.c:2332
 msgid "NOTE: a key's S/N does not match the card's one\n"
-msgstr "OBSERVERA: serienumret för en nyckel stämmer inte med kortets serienummer\n"
+msgstr ""
+"OBSERVERA: serienumret för en nyckel stämmer inte med kortets serienummer\n"
 
-#: ../g10/import.c:2340
+#: g10/import.c:2340
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "OBSERVERA: primärnyckeln är ansluten och lagrad på kort\n"
 
-#: ../g10/import.c:2342
+#: g10/import.c:2342
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "OBSERVERA: sekundärnyckeln är ansluten och lagrad på kort\n"
 
-#: ../g10/keydb.c:181
+#: g10/keydb.c:181
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
 
-#: ../g10/keydb.c:187
+#: g10/keydb.c:187
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: ../g10/keydb.c:328
-#: ../g10/keydb.c:331
+#: g10/keydb.c:328 g10/keydb.c:331
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "nyckelblockresurs \"%s\": %s\n"
 
-#: ../g10/keydb.c:710
+#: g10/keydb.c:710
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: ../g10/keyedit.c:265
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[spärr]"
 
-#: ../g10/keyedit.c:266
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[självsignatur]"
 
-#: ../g10/keyedit.c:344
-#: ../g10/keylist.c:392
+#: g10/keyedit.c:344 g10/keylist.c:392
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: ../g10/keyedit.c:346
-#: ../g10/keylist.c:394
+#: g10/keyedit.c:346 g10/keylist.c:394
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: ../g10/keyedit.c:348
-#: ../g10/keylist.c:396
+#: g10/keyedit.c:348 g10/keylist.c:396
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur validerades inte eftersom nyckeln saknades\n"
 
-#: ../g10/keyedit.c:350
-#: ../g10/keylist.c:398
+#: g10/keyedit.c:350 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer validerades inte eftersom nycklar saknades\n"
 
-#: ../g10/keyedit.c:352
-#: ../g10/keylist.c:400
+#: g10/keyedit.c:352 g10/keylist.c:400
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur validerades inte eftersom ett fel uppstod\n"
 
-#: ../g10/keyedit.c:354
-#: ../g10/keylist.c:402
+#: g10/keyedit.c:354 g10/keylist.c:402
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer validerades inte eftersom fel uppstod\n"
 
-#: ../g10/keyedit.c:356
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 användaridentitet utan giltig självsignatur hittades\n"
 
-#: ../g10/keyedit.c:358
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d användaridentiteter utan giltiga självsignaturer hittades\n"
 
-#. Same string as pkclist.c:do_edit_ownertrust
-#. This string also used in keyedit.c:trustsig_prompt
-#: ../g10/keyedit.c:414
-#: ../g10/pkclist.c:261
+#: g10/keyedit.c:414 g10/pkclist.c:261
 msgid ""
-"Please decide how far you trust this user to correctly verify other users' keys\n"
-"(by looking at passports, checking fingerprints from different sources, etc.)\n"
+"Please decide how far you trust this user to correctly verify other users' "
+"keys\n"
+"(by looking at passports, checking fingerprints from different sources, "
+"etc.)\n"
 msgstr ""
 "Bestäm hur mycket du litar på denna användare när det gäller att\n"
 "korrekt validera andra användares nycklar (genom att undersöka pass,\n"
 "undersöka fingeravtryck från olika källor, etc.)\n"
 
-#: ../g10/keyedit.c:418
-#: ../g10/pkclist.c:273
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Jag litar marginellt\n"
 
-#: ../g10/keyedit.c:419
-#: ../g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Jag litar fullständigt\n"
 
-#: ../g10/keyedit.c:438
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -3322,52 +3112,46 @@ msgstr ""
 "Ett djup större än 1 tillåter att nyckeln som du signerar kan\n"
 "skapa tillitssignaturer åt dig.\n"
 
-#: ../g10/keyedit.c:454
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
-msgstr "Ange en domän för att begränsa denna signatur. eller Enter för ingen.\n"
+msgstr ""
+"Ange en domän för att begränsa denna signatur. eller Enter för ingen.\n"
 
-#: ../g10/keyedit.c:598
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Användaridentiteten \"%s\" är spärrad."
 
-#: ../g10/keyedit.c:607
-#: ../g10/keyedit.c:635
-#: ../g10/keyedit.c:662
-#: ../g10/keyedit.c:830
-#: ../g10/keyedit.c:895
-#: ../g10/keyedit.c:1753
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
-#: ../g10/keyedit.c:621
-#: ../g10/keyedit.c:649
-#: ../g10/keyedit.c:676
-#: ../g10/keyedit.c:836
-#: ../g10/keyedit.c:1759
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
-#: ../g10/keyedit.c:626
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Giltighetstiden för användaridentiteten \"%s\" har gått ut."
 
-#: ../g10/keyedit.c:654
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Användaridentiteten \"%s\" är inte självsignerad."
 
-#: ../g10/keyedit.c:682
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Användaridentiteten \"%s\" är signerbar.  "
 
-#: ../g10/keyedit.c:684
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "Signera den? (j/N) "
 
-#: ../g10/keyedit.c:706
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3376,11 +3160,11 @@ msgstr ""
 "Självsignaturen på \"%s\"\n"
 "är en signatur av PGP 2.x-typ.\n"
 
-#: ../g10/keyedit.c:715
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vill du göra om den till en självsignatur av OpenPGP-typ? (j/N) "
 
-#: ../g10/keyedit.c:729
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3389,13 +3173,13 @@ msgstr ""
 "Giltighetstiden för din nuvarande signatur på \"%s\"\n"
 "har gått ut.\n"
 
-#: ../g10/keyedit.c:733
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
-msgstr "Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/n) "
+msgstr ""
+"Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/"
+"n) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: ../g10/keyedit.c:754
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3404,83 +3188,89 @@ msgstr ""
 "Din nuvarande signatur på \"%s\"\n"
 "är en lokal signatur.\n"
 
-#: ../g10/keyedit.c:758
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vill du ändra den till en fullständig exporterbar signatur? (j/N) "
 
-#: ../g10/keyedit.c:779
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" var redan lokalt signerad med nyckeln %s\n"
 
-#: ../g10/keyedit.c:782
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" var redan signerad av nyckeln %s\n"
 
-#: ../g10/keyedit.c:787
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vill du verkligen signera den igen ändå?(j/N)"
 
-#: ../g10/keyedit.c:809
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Det finns inget att signera med nyckeln %s\n"
 
-#: ../g10/keyedit.c:824
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
-#: ../g10/keyedit.c:842
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
 
-#: ../g10/keyedit.c:848
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr "Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
+msgstr ""
+"Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
 
-#: ../g10/keyedit.c:888
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
-msgstr "Du kan inte göra en OpenPGP-signatur på en PGP 2.x-nyckel när du är i --pgp2-läge\n"
+#: g10/keyedit.c:888
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"Du kan inte göra en OpenPGP-signatur på en PGP 2.x-nyckel när du är i --pgp2-"
+"läge\n"
 
-#: ../g10/keyedit.c:890
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Detta skulle göra nyckeln oanvändbar i PGP 2.x.\n"
 
-#: ../g10/keyedit.c:915
+#: g10/keyedit.c:915
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n"
 "personen som nämns ovan?  Om du inte vet vad du ska svara, svara \"0\".\n"
 
-#: ../g10/keyedit.c:920
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Jag vill inte svara.%s\n"
 
-#: ../g10/keyedit.c:922
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Jag har inte kontrollerat alls.%s\n"
 
-#: ../g10/keyedit.c:924
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Jag har gjort viss kontroll.%s\n"
 
-#: ../g10/keyedit.c:926
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Jag har gjort en noggrann kontroll.%s\n"
 
-#: ../g10/keyedit.c:932
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt val? (skriv \"?\" för mer information): "
 
-#: ../g10/keyedit.c:956
+#: g10/keyedit.c:956
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3489,83 +3279,76 @@ msgstr ""
 "Är du verkligen säker på att du vill signera denna nyckel\n"
 "med din nyckel \"%s\" (%s)\n"
 
-#: ../g10/keyedit.c:963
+#: g10/keyedit.c:963
 msgid "This will be a self-signature.\n"
 msgstr "Detta kommer att bli en självsignatur.\n"
 
-#: ../g10/keyedit.c:969
+#: g10/keyedit.c:969
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "VARNING: signaturen kommer inte att markeras som icke-exporterbar.\n"
 
-#: ../g10/keyedit.c:977
+#: g10/keyedit.c:977
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "VARNING: signaturen kommer att markeras som icke-spärrbar.\n"
 
-#: ../g10/keyedit.c:987
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Signaturen kommer att markeras som icke-exporterbar.\n"
 
-#: ../g10/keyedit.c:994
+#: g10/keyedit.c:994
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Signaturen kommer att märkas som icke möjlig att spärra.\n"
 
-#: ../g10/keyedit.c:1001
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr "Jag har inte kontrollerat denna nyckel alls.\n"
 
-#: ../g10/keyedit.c:1006
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr "Jag har gjort viss kontroll av denna nyckel.\n"
 
-#: ../g10/keyedit.c:1011
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
 
-#: ../g10/keyedit.c:1021
+#: g10/keyedit.c:1021
 msgid "Really sign? (y/N) "
 msgstr "Verkligen signera? (j/N) "
 
-#: ../g10/keyedit.c:1066
-#: ../g10/keyedit.c:4804
-#: ../g10/keyedit.c:4895
-#: ../g10/keyedit.c:4959
-#: ../g10/keyedit.c:5020
-#: ../g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: ../g10/keyedit.c:1131
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
-msgstr "Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras att ändra.\n"
+msgstr ""
+"Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
+"att ändra.\n"
 
-#: ../g10/keyedit.c:1142
-#: ../g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: ../g10/keyedit.c:1146
-#: ../g10/keygen.c:3575
-#: ../g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n"
 
-#: ../g10/keyedit.c:1150
-#: ../g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemliga delar av den primära nyckeln är lagrade på kortet.\n"
 
-#: ../g10/keyedit.c:1154
-#: ../g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
-#: ../g10/keyedit.c:1178
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: ../g10/keyedit.c:1184
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3573,12 +3356,11 @@ msgstr ""
 "Skriv in den nya lösenfrasen för den hemliga nyckeln.\n"
 "\n"
 
-#: ../g10/keyedit.c:1199
-#: ../g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenfrasen repeterades inte korrekt; försök igen."
 
-#: ../g10/keyedit.c:1204
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3586,435 +3368,424 @@ msgstr ""
 "Du vill inte ha någon lösenfras - detta är möjligen en *dålig* idé!\n"
 "\n"
 
-#: ../g10/keyedit.c:1207
+#: g10/keyedit.c:1207
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vill du verkligen göra detta? (j/N) "
 
-#: ../g10/keyedit.c:1278
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
-#: ../g10/keyedit.c:1364
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: ../g10/keyedit.c:1367
+#: g10/keyedit.c:1367
 msgid "show key fingerprint"
 msgstr "visa nyckelns fingeravtryck"
 
-#: ../g10/keyedit.c:1368
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "lista nycklar och användaridentiteter"
 
-#: ../g10/keyedit.c:1370
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "välj användaridentiteten N"
 
-#: ../g10/keyedit.c:1371
+#: g10/keyedit.c:1371
 msgid "select subkey N"
 msgstr "välj undernyckel N"
 
-#: ../g10/keyedit.c:1372
+#: g10/keyedit.c:1372
 msgid "check signatures"
 msgstr "kontrollera signaturer"
 
-#: ../g10/keyedit.c:1377
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
-msgstr "signera valda användaridentiteter [* se nedan för relaterade kommandon]"
+msgstr ""
+"signera valda användaridentiteter [* se nedan för relaterade kommandon]"
 
-#. "lsign" and friends will never match since "sign" comes first
-#. and it is a tail match.  They are just here so they show up in
-#. the help menu.
-#: ../g10/keyedit.c:1382
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs locally"
 msgstr "signera valda användaridentiteter lokalt"
 
-#: ../g10/keyedit.c:1384
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs with a trust signature"
 msgstr "signera valda användaridentiteter med en tillitssignatur"
 
-#: ../g10/keyedit.c:1386
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "signera valda användaridentiteter med en icke-spärrbar signatur"
 
-#: ../g10/keyedit.c:1390
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: ../g10/keyedit.c:1392
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "lägg till ett foto-id"
 
-#: ../g10/keyedit.c:1394
+#: g10/keyedit.c:1394
 msgid "delete selected user IDs"
 msgstr "ta bort valda användaridentiteter"
 
-#: ../g10/keyedit.c:1399
+#: g10/keyedit.c:1399
 msgid "add a subkey"
 msgstr "lägg till en undernyckel"
 
-#: ../g10/keyedit.c:1403
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr "lägg till en nyckel till ett smartkort"
 
-#: ../g10/keyedit.c:1405
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr "flytta en nyckel till ett smartkort"
 
-#: ../g10/keyedit.c:1407
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr "flytta en nyckelkopia till ett smartkort"
 
-#: ../g10/keyedit.c:1411
+#: g10/keyedit.c:1411
 msgid "delete selected subkeys"
 msgstr "ta bort valda undernycklar"
 
-#: ../g10/keyedit.c:1413
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "lägg till en spärrnyckel"
 
-#: ../g10/keyedit.c:1415
+#: g10/keyedit.c:1415
 msgid "delete signatures from the selected user IDs"
 msgstr "ta bort signaturer från valda användaridentiteter"
 
-#: ../g10/keyedit.c:1417
+#: g10/keyedit.c:1417
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "ändra utgångsdatumet för nyckeln eller valda undernycklar"
 
-#: ../g10/keyedit.c:1419
+#: g10/keyedit.c:1419
 msgid "flag the selected user ID as primary"
 msgstr "flagga vald användaridentitet som primär"
 
-#: ../g10/keyedit.c:1421
+#: g10/keyedit.c:1421
 msgid "toggle between the secret and public key listings"
 msgstr "växla mellan att lista hemliga och publika nycklar"
 
-#: ../g10/keyedit.c:1424
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "lista inställningar (expertläge)"
 
-#: ../g10/keyedit.c:1426
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "lista inställningar (utförligt)"
 
-#: ../g10/keyedit.c:1428
+#: g10/keyedit.c:1428
 msgid "set preference list for the selected user IDs"
 msgstr "ställ in inställningslista för valda användaridentiteter"
 
-#: ../g10/keyedit.c:1433
+#: g10/keyedit.c:1433
 msgid "set the preferred keyserver URL for the selected user IDs"
-msgstr "ställ in url till föredragen nyckelserver för valda användaridentiteter"
+msgstr ""
+"ställ in url till föredragen nyckelserver för valda användaridentiteter"
 
-#: ../g10/keyedit.c:1435
+#: g10/keyedit.c:1435
 msgid "set a notation for the selected user IDs"
 msgstr "ställ in en notation för valda användaridentiteter"
 
-#: ../g10/keyedit.c:1437
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "ändra lösenfrasen"
 
 # originalet borde ha ett value
-#: ../g10/keyedit.c:1441
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: ../g10/keyedit.c:1443
+#: g10/keyedit.c:1443
 msgid "revoke signatures on the selected user IDs"
 msgstr "spärra signaturer på valda användaridentiteter"
 
-#: ../g10/keyedit.c:1445
+#: g10/keyedit.c:1445
 msgid "revoke selected user IDs"
 msgstr "spärra valda användaridentiteter"
 
-#: ../g10/keyedit.c:1450
+#: g10/keyedit.c:1450
 msgid "revoke key or selected subkeys"
 msgstr "spärra nyckel eller valda undernycklar"
 
-#: ../g10/keyedit.c:1451
+#: g10/keyedit.c:1451
 msgid "enable key"
 msgstr "aktivera nyckel"
 
-#: ../g10/keyedit.c:1452
+#: g10/keyedit.c:1452
 msgid "disable key"
 msgstr "inaktivera nyckel"
 
-#: ../g10/keyedit.c:1453
+#: g10/keyedit.c:1453
 msgid "show selected photo IDs"
 msgstr "visa valda foto-id:n"
 
-#: ../g10/keyedit.c:1455
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
-msgstr "komprimera oanvändbara användaridentiteter och ta bort oanvändbara signaturer från nyckeln"
+msgstr ""
+"komprimera oanvändbara användaridentiteter och ta bort oanvändbara "
+"signaturer från nyckeln"
 
-#: ../g10/keyedit.c:1457
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
-msgstr "komprimera oanvändbara användaridentiteter och ta bort alla signaturer från nyckeln"
+msgstr ""
+"komprimera oanvändbara användaridentiteter och ta bort alla signaturer från "
+"nyckeln"
 
-#: ../g10/keyedit.c:1579
+#: g10/keyedit.c:1579
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fel vid läsning av hemligt nyckelblock \"%s\": %s\n"
 
-#: ../g10/keyedit.c:1597
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: ../g10/keyedit.c:1680
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
 
-#: ../g10/keyedit.c:1688
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: ../g10/keyedit.c:1707
+#: g10/keyedit.c:1707
 msgid ""
-"* The `sign' command may be prefixed with an `l' for local signatures (lsign),\n"
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
 "  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
-"* Kommandot \"sign\" kan inledas med ett \"l\" för lokal signaturer (lsign),\n"
-"  ett \"t\" för tillitssignaturer (tsign), ett \"nr\" för icke-sprärrbara signaturer\n"
+"* Kommandot \"sign\" kan inledas med ett \"l\" för lokal signaturer "
+"(lsign),\n"
+"  ett \"t\" för tillitssignaturer (tsign), ett \"nr\" för icke-sprärrbara "
+"signaturer\n"
 "  (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
 
-#: ../g10/keyedit.c:1747
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
-#: ../g10/keyedit.c:1766
+#: g10/keyedit.c:1766
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Verkligen signera alla användaridentiteter? (j/N) "
 
-#: ../g10/keyedit.c:1773
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj de användaridentiteter som du vill signera\n"
 
-#: ../g10/keyedit.c:1782
+#: g10/keyedit.c:1782
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Okänd signaturtyp \"%s\"\n"
 
-#: ../g10/keyedit.c:1805
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: ../g10/keyedit.c:1827
-#: ../g10/keyedit.c:1847
-#: ../g10/keyedit.c:2013
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: ../g10/keyedit.c:1829
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: ../g10/keyedit.c:1831
+#: g10/keyedit.c:1831
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Verkligen ta bort alla valda användaridentiteter? (j/N) "
 
-#: ../g10/keyedit.c:1832
+#: g10/keyedit.c:1832
 msgid "Really remove this user ID? (y/N) "
 msgstr "Verkligen ta bort denna användaridentitet? (j/N) "
 
-#: ../g10/keyedit.c:1882
+#: g10/keyedit.c:1882
 msgid "Really move the primary key? (y/N) "
 msgstr "Verkligen flytta den primära nyckeln? (j/N) "
 
-#: ../g10/keyedit.c:1894
+#: g10/keyedit.c:1894
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja exakt en nyckel.\n"
 
-#: ../g10/keyedit.c:1922
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr "Kommandot förväntar ett filnamnsargument\n"
 
-#: ../g10/keyedit.c:1936
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Kan inte öppna \"%s\": %s\n"
 
-#: ../g10/keyedit.c:1953
+#: g10/keyedit.c:1953
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Fel vid läsning av säkerhetskopierad nyckel från \"%s\": %s\n"
 
-#: ../g10/keyedit.c:1977
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: ../g10/keyedit.c:1980
+#: g10/keyedit.c:1980
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: ../g10/keyedit.c:1981
+#: g10/keyedit.c:1981
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vill du verkligen ta bort denna nyckel? (j/N) "
 
-#: ../g10/keyedit.c:2016
+#: g10/keyedit.c:2016
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Verkligen spärra alla valda användaridentiteter? (j/N) "
 
-#: ../g10/keyedit.c:2017
+#: g10/keyedit.c:2017
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Verkligen spärra denna användaridentitet? (j/N) "
 
-#: ../g10/keyedit.c:2035
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vill du verkligen spärra hela nyckeln? (j/N) "
 
-#: ../g10/keyedit.c:2046
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vill du verkligen spärra de valda undernycklarna? (j/N) "
 
-#: ../g10/keyedit.c:2048
+#: g10/keyedit.c:2048
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vill du verkligen spärra denna undernyckel? (j/N) "
 
-#: ../g10/keyedit.c:2098
+#: g10/keyedit.c:2098
 msgid "Owner trust may not be set while using a user provided trust database\n"
-msgstr "Ägartillit får inte ställas in när en tillitsdatabas används som användaren tillhandahåller\n"
+msgstr ""
+"Ägartillit får inte ställas in när en tillitsdatabas används som användaren "
+"tillhandahåller\n"
 
-#: ../g10/keyedit.c:2140
+#: g10/keyedit.c:2140
 msgid "Set preference list to:\n"
 msgstr "Ställ in inställningslista till:\n"
 
-#: ../g10/keyedit.c:2146
+#: g10/keyedit.c:2146
 msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "Vill du verkligen uppdatera inställningarna för valda användaridentiteter? (j/N) "
+msgstr ""
+"Vill du verkligen uppdatera inställningarna för valda användaridentiteter? "
+"(j/N) "
 
-#: ../g10/keyedit.c:2148
+#: g10/keyedit.c:2148
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen uppdatera inställningarna? (j/N) "
 
-#: ../g10/keyedit.c:2216
+#: g10/keyedit.c:2216
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringar? (j/N) "
 
-#: ../g10/keyedit.c:2219
+#: g10/keyedit.c:2219
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? (j/N) "
 
-#: ../g10/keyedit.c:2229
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: ../g10/keyedit.c:2236
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: ../g10/keyedit.c:2243
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#: ../g10/keyedit.c:2344
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: ../g10/keyedit.c:2395
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: ../g10/keyedit.c:2406
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr "Nyckelserver no-modify"
 
-#: ../g10/keyedit.c:2421
-#: ../g10/keylist.c:310
+#: g10/keyedit.c:2421 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr "Föredragen nyckelserver: "
 
-#: ../g10/keyedit.c:2429
-#: ../g10/keyedit.c:2430
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: ../g10/keyedit.c:2640
+#: g10/keyedit.c:2640
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr "Du kan inte ange några inställningar för en användaridentitet av PGP 2.x-typ.\n"
+msgstr ""
+"Du kan inte ange några inställningar för en användaridentitet av PGP 2.x-"
+"typ.\n"
 
-#: ../g10/keyedit.c:2699
+#: g10/keyedit.c:2699
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Den här nyckeln blev spärrad den %s av %s nyckel %s\n"
 
-#: ../g10/keyedit.c:2720
+#: g10/keyedit.c:2720
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Den här nyckeln kan vara spärrad av %s nyckel %s"
 
-#: ../g10/keyedit.c:2726
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr "(känsligt)"
 
-#: ../g10/keyedit.c:2742
-#: ../g10/keyedit.c:2798
-#: ../g10/keyedit.c:2859
-#: ../g10/keyedit.c:2874
-#: ../g10/keylist.c:196
-#: ../g10/keyserver.c:529
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keylist.c:196 g10/keyserver.c:529
 #, c-format
 msgid "created: %s"
 msgstr "skapat: %s"
 
-#: ../g10/keyedit.c:2745
-#: ../g10/keylist.c:812
-#: ../g10/keylist.c:906
-#: ../g10/mainproc.c:989
+#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "spärrad: %s"
 
-#: ../g10/keyedit.c:2747
-#: ../g10/keylist.c:783
-#: ../g10/keylist.c:818
-#: ../g10/keylist.c:912
+#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, c-format
 msgid "expired: %s"
 msgstr "utgånget: %s"
 
-#: ../g10/keyedit.c:2749
-#: ../g10/keyedit.c:2800
-#: ../g10/keyedit.c:2861
-#: ../g10/keyedit.c:2876
-#: ../g10/keylist.c:198
-#: ../g10/keylist.c:789
-#: ../g10/keylist.c:824
-#: ../g10/keylist.c:918
-#: ../g10/keylist.c:939
-#: ../g10/keyserver.c:535
-#: ../g10/mainproc.c:995
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
+#: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
 
-#: ../g10/keyedit.c:2751
+#: g10/keyedit.c:2751
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
 
-#: ../g10/keyedit.c:2766
+#: g10/keyedit.c:2766
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: ../g10/keyedit.c:2770
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr "giltighet: %s"
 
-#: ../g10/keyedit.c:2777
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: ../g10/keyedit.c:2805
-#: ../g10/keylist.c:202
+#: g10/keyedit.c:2805 g10/keylist.c:202
 msgid "card-no: "
 msgstr "kortnummer: "
 
-#: ../g10/keyedit.c:2829
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4022,25 +3793,17 @@ msgstr ""
 "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
 "såvida inte du startar om programmet.\n"
 
-#: ../g10/keyedit.c:2893
-#: ../g10/keyedit.c:3239
-#: ../g10/keyserver.c:539
-#: ../g10/mainproc.c:1841
-#: ../g10/trustdb.c:1173
-#: ../g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "spärrad"
 
-#: ../g10/keyedit.c:2895
-#: ../g10/keyedit.c:3241
-#: ../g10/keyserver.c:543
-#: ../g10/mainproc.c:1843
-#: ../g10/trustdb.c:526
-#: ../g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "utgånget"
 
-#: ../g10/keyedit.c:2960
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4049,364 +3812,351 @@ msgstr ""
 "Detta kommando kan göra att en annan användaridentitet antas\n"
 "vara den primära identiteten.\n"
 
-#: ../g10/keyedit.c:3021
+#: g10/keyedit.c:3021
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 "VARNING: Detta är en nyckel av PGP2-typ.  Om du lägger till ett foto-id kan\n"
 "         vissa versioner av PGP avvisa denna nyckel.\n"
 
-#: ../g10/keyedit.c:3026
-#: ../g10/keyedit.c:3361
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
 
-#: ../g10/keyedit.c:3032
+#: g10/keyedit.c:3032
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett foto-id till en nyckel av PGP 2-typ.\n"
 
-#: ../g10/keyedit.c:3172
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: ../g10/keyedit.c:3182
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: ../g10/keyedit.c:3186
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: ../g10/keyedit.c:3192
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Verkligen ta bort denna självsignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: ../g10/keyedit.c:3206
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: ../g10/keyedit.c:3207
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: ../g10/keyedit.c:3210
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: ../g10/keyedit.c:3243
-#: ../g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "ogiltigt"
 
-#: ../g10/keyedit.c:3245
+#: g10/keyedit.c:3245
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
 
-#: ../g10/keyedit.c:3252
+#: g10/keyedit.c:3252
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: ../g10/keyedit.c:3253
+#: g10/keyedit.c:3253
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: ../g10/keyedit.c:3261
+#: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Användaridentitet \"%s\": redan minimerad\n"
 
-#: ../g10/keyedit.c:3262
+#: g10/keyedit.c:3262
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användaridentitet \"%s\": redan rensad\n"
 
-#: ../g10/keyedit.c:3356
+#: g10/keyedit.c:3356
 msgid ""
-"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may cause\n"
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
-"VARNING: Detta är en PGP 2.x-nyckel. Om du lägger till en spärrnyckel kan denna\n"
+"VARNING: Detta är en PGP 2.x-nyckel. Om du lägger till en spärrnyckel kan "
+"denna\n"
 "         nyckel inte användas i vissa versioner av PGP.\n"
 
-#: ../g10/keyedit.c:3367
+#: g10/keyedit.c:3367
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du får inte lägga till en spärrnyckel för en PGP 2.x-nyckel.\n"
 
-#: ../g10/keyedit.c:3387
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användaridentiteten för spärrnyckeln: "
 
-#: ../g10/keyedit.c:3412
+#: g10/keyedit.c:3412
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "det går inte att använda en PGP 2.x-nyckel som spärrnyckel\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
-#: ../g10/keyedit.c:3427
+#: g10/keyedit.c:3427
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "du kan inte ange en nyckel som sin egen spärrnyckel\n"
 
-#: ../g10/keyedit.c:3449
+#: g10/keyedit.c:3449
 msgid "this key has already been designated as a revoker\n"
 msgstr "den här nyckeln har redan markerats som en spärrnyckel\n"
 
-#: ../g10/keyedit.c:3468
+#: g10/keyedit.c:3468
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VARNING: det går aldrig att ångra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: ../g10/keyedit.c:3474
-msgid "Are you sure you want to appoint this key as a designated revoker? (y/N) "
-msgstr "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
+#: g10/keyedit.c:3474
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgstr ""
+"Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
-#: ../g10/keyedit.c:3535
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: ../g10/keyedit.c:3541
+#: g10/keyedit.c:3541
 msgid "Please select at most one subkey.\n"
 msgstr "Välj som mest en undernyckel.\n"
 
-#: ../g10/keyedit.c:3545
+#: g10/keyedit.c:3545
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: ../g10/keyedit.c:3548
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: ../g10/keyedit.c:3594
+#: g10/keyedit.c:3594
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: ../g10/keyedit.c:3610
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
 # Vad betyder det?
-#: ../g10/keyedit.c:3688
+#: g10/keyedit.c:3688
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
 
-#: ../g10/keyedit.c:3694
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "undernyckeln %s signerar inte och behöver inte korscertifieras\n"
 
-#: ../g10/keyedit.c:3857
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Välj endast en användaridentitet.\n"
 
-#: ../g10/keyedit.c:3896
-#: ../g10/keyedit.c:4006
-#: ../g10/keyedit.c:4126
-#: ../g10/keyedit.c:4267
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3-självsignatur på användaridentiteten \"%s\"\n"
 
-#: ../g10/keyedit.c:4067
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr "Ange din föredragna nyckelserver-url: "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: ../g10/keyedit.c:4147
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Är du säker på att du vill ersätta det? (j/N) "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: ../g10/keyedit.c:4148
+#: g10/keyedit.c:4148
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Är du säker på att du vill ta bort det? (j/N) "
 
-#: ../g10/keyedit.c:4210
+#: g10/keyedit.c:4210
 msgid "Enter the notation: "
 msgstr "Ange notationen: "
 
-#: ../g10/keyedit.c:4359
+#: g10/keyedit.c:4359
 msgid "Proceed? (y/N) "
 msgstr "Fortsätt? (j/N) "
 
-#: ../g10/keyedit.c:4423
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med indexet %d\n"
 
-#: ../g10/keyedit.c:4481
+#: g10/keyedit.c:4481
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med hashen %s\n"
 
-#: ../g10/keyedit.c:4508
+#: g10/keyedit.c:4508
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: ../g10/keyedit.c:4643
+#: g10/keyedit.c:4643
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: ../g10/keyedit.c:4646
-#: ../g10/keyedit.c:4710
-#: ../g10/keyedit.c:4753
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signerat av din nyckel %s den %s%s%s\n"
 
-#: ../g10/keyedit.c:4648
-#: ../g10/keyedit.c:4712
-#: ../g10/keyedit.c:4755
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: ../g10/keyedit.c:4652
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: ../g10/keyedit.c:4656
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Är du säker på att du fortfarande vill spärra den? (j/N)"
 
-#: ../g10/keyedit.c:4660
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
 
-#. FIXME: detect duplicates here
-#: ../g10/keyedit.c:4687
+#: g10/keyedit.c:4687
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signerat följande användaridentiteter med nyckeln %s:\n"
 
-#: ../g10/keyedit.c:4713
+#: g10/keyedit.c:4713
 msgid " (non-revocable)"
 msgstr " (inte spärrbar)"
 
-#: ../g10/keyedit.c:4720
+#: g10/keyedit.c:4720
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "spärrad av din nyckel %s den %s\n"
 
-#: ../g10/keyedit.c:4742
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du är på väg att spärra dessa signaturer:\n"
 
-#: ../g10/keyedit.c:4762
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
 
-#: ../g10/keyedit.c:4792
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: ../g10/keyedit.c:4862
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "användaridentiteten \"%s\" är redan spärrad\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
-#: ../g10/keyedit.c:4879
+#: g10/keyedit.c:4879
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
-msgstr "VARNING: en signatur på en användaridentitet är daterad %d sekunder in i framtiden\n"
+msgstr ""
+"VARNING: en signatur på en användaridentitet är daterad %d sekunder in i "
+"framtiden\n"
 
-#: ../g10/keyedit.c:4943
+#: g10/keyedit.c:4943
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nyckeln %s är redan spärrad.\n"
 
-#: ../g10/keyedit.c:5005
+#: g10/keyedit.c:5005
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernyckeln %s är redan spärrad.\n"
 
-#: ../g10/keyedit.c:5100
+#: g10/keyedit.c:5100
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Visar %s foto-id med storleken %ld för nyckeln %s (uid %d)\n"
 
-#: ../g10/keygen.c:269
+#: g10/keygen.c:269
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "inställningen \"%s\" förekommer flera gånger\n"
 
-#: ../g10/keygen.c:276
+#: g10/keygen.c:276
 msgid "too many cipher preferences\n"
 msgstr "för många chifferinställningar\n"
 
-#: ../g10/keygen.c:278
+#: g10/keygen.c:278
 msgid "too many digest preferences\n"
 msgstr "för många sammandragsinställningar\n"
 
-#: ../g10/keygen.c:280
+#: g10/keygen.c:280
 msgid "too many compression preferences\n"
 msgstr "för många komprimeringsinställningar\n"
 
-#: ../g10/keygen.c:405
+#: g10/keygen.c:405
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "ogiltig post \"%s\" i inställningssträngen\n"
 
-#: ../g10/keygen.c:885
+#: g10/keygen.c:885
 msgid "writing direct signature\n"
 msgstr "skriver direkt signatur\n"
 
-#: ../g10/keygen.c:927
+#: g10/keygen.c:927
 msgid "writing self signature\n"
 msgstr "skriver självsignatur\n"
 
-#: ../g10/keygen.c:984
+#: g10/keygen.c:984
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: ../g10/keygen.c:1152
-#: ../g10/keygen.c:1263
-#: ../g10/keygen.c:1268
-#: ../g10/keygen.c:1403
-#: ../g10/keygen.c:3088
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: ../g10/keygen.c:1158
-#: ../g10/keygen.c:1274
-#: ../g10/keygen.c:1409
-#: ../g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: ../g10/keygen.c:1300
-msgid "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
-msgstr "VARNING: vissa OpenPGP-program kan inte hantera en DSA-nyckel med den här sammandragsstorleken\n"
+#: g10/keygen.c:1300
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+"VARNING: vissa OpenPGP-program kan inte hantera en DSA-nyckel med den här "
+"sammandragsstorleken\n"
 
-#: ../g10/keygen.c:1520
+#: g10/keygen.c:1520
 msgid "Sign"
 msgstr "Signera"
 
-#: ../g10/keygen.c:1523
+#: g10/keygen.c:1523
 msgid "Certify"
 msgstr "Certifiera"
 
-#: ../g10/keygen.c:1526
+#: g10/keygen.c:1526
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: ../g10/keygen.c:1529
+#: g10/keygen.c:1529
 msgid "Authenticate"
 msgstr "Autentisera"
 
@@ -4424,117 +4174,110 @@ msgstr "Autentisera"
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: ../g10/keygen.c:1547
+#: g10/keygen.c:1547
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: ../g10/keygen.c:1570
+#: g10/keygen.c:1570
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Möjliga åtgärder för en %s-nyckel: "
 
-#: ../g10/keygen.c:1574
+#: g10/keygen.c:1574
 msgid "Current allowed actions: "
 msgstr "För närvarande tillåtna åtgärder: "
 
-#: ../g10/keygen.c:1579
+#: g10/keygen.c:1579
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Växla signeringsförmågan\n"
 
-#: ../g10/keygen.c:1582
+#: g10/keygen.c:1582
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Växla krypteringsförmågan\n"
 
-#: ../g10/keygen.c:1585
+#: g10/keygen.c:1585
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Växla autentiseringsförmågan\n"
 
-#: ../g10/keygen.c:1588
+#: g10/keygen.c:1588
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Färdig\n"
 
-#. Get the type of the key.
-#: ../g10/keygen.c:1644
-#: ../sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: ../g10/keygen.c:1646
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA och Elgamal (standard)\n"
 
-#: ../g10/keygen.c:1647
+#: g10/keygen.c:1647
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: ../g10/keygen.c:1649
+#: g10/keygen.c:1649
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (ställ in dina egna förmågor)\n"
 
-#: ../g10/keygen.c:1651
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (endast kryptering)\n"
 
-#: ../g10/keygen.c:1652
+#: g10/keygen.c:1652
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (endast signering)\n"
 
-#: ../g10/keygen.c:1654
+#: g10/keygen.c:1654
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: ../g10/keygen.c:1656
+#: g10/keygen.c:1656
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ställ in dina egna förmågor)\n"
 
-#: ../g10/keygen.c:1725
+#: g10/keygen.c:1725
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-nyckelparet kommer att ha %u bitar.\n"
 
-#: ../g10/keygen.c:1735
+#: g10/keygen.c:1735
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s-nycklar kan vara mellan %u och %u bitar långa.\n"
 
-#: ../g10/keygen.c:1742
-#: ../sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Vilken nyckelstorlek vill du ha? (%u) "
 
-#: ../g10/keygen.c:1756
-#: ../sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s nyckelstorlekar måste vara inom intervallet %u-%u\n"
 
-#: ../g10/keygen.c:1762
-#: ../sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: ../g10/keygen.c:1767
-#: ../g10/keygen.c:1772
-#: ../sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "avrundade uppåt till %u bitar\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: ../g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4551,7 +4294,7 @@ msgstr ""
 "      <n>y = nyckeln blir ogiltig efter n år\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: ../g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4567,38 +4310,38 @@ msgstr ""
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: ../g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: ../g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen är giltig hur länge? (%s) "
 
-#: ../g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: ../g10/keygen.c:1905
+#: g10/keygen.c:1907
 msgid "Key does not expire at all\n"
 msgstr "Nyckeln går aldrig ut\n"
 
-#: ../g10/keygen.c:1906
+#: g10/keygen.c:1908
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen går aldrig ut\n"
 
-#: ../g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln går ut %s\n"
 
-#: ../g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen går ut %s\n"
 
-#: ../g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4606,77 +4349,77 @@ msgstr ""
 "Ditt system kan inte visa datum senare än år 2038.\n"
 "Datum fram till år 2106 kommer dock att hanteras korrekt.\n"
 
-#: ../g10/keygen.c:1923
+#: g10/keygen.c:1931
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta? (j/N) "
 
-#: ../g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 "\n"
-"GnuPG behöver konstruera en användaridentitet för att identifiera din nyckel.\n"
+"GnuPG behöver konstruera en användaridentitet för att identifiera din "
+"nyckel.\n"
 "\n"
 
-#. There is no translation for the string thus we to use
-#. the old info text.  gettext has no way to tell whether
-#. a translation is actually available, thus we need to
-#. to compare again.
-#: ../g10/keygen.c:1959
+#: g10/keygen.c:1967
 msgid ""
 "\n"
-"You need a user ID to identify your key; the software constructs the user ID\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
 "from the Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 msgstr ""
 "\n"
-"Du behöver en användaridentitet för att identifiera din nyckel; programvaran\n"
-"konstruerar en användaridentitet från verkligt namn, kommentar och e-postadress\n"
+"Du behöver en användaridentitet för att identifiera din nyckel; "
+"programvaran\n"
+"konstruerar en användaridentitet från verkligt namn, kommentar och e-"
+"postadress\n"
 "enligt följande format: \n"
 "    \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
 "\n"
 
-#: ../g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Namn: "
 
-#: ../g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: ../g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: ../g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: ../g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: ../g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: ../g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: ../g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: ../g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckentabellen \"%s\"\n"
 
-#: ../g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4687,7 +4430,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: ../g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 
@@ -4703,24 +4446,24 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: ../g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: ../g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
 
-#: ../g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
 
-#: ../g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: ../g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4728,12 +4471,12 @@ msgstr ""
 "Du behöver en lösenfras för att skydda din hemliga nyckel\n"
 "\n"
 
-#: ../g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: ../g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4745,7 +4488,7 @@ msgstr ""
 "om du använder detta program med flaggan \"--edit-key\".\n"
 "\n"
 
-#: ../g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4757,812 +4500,783 @@ msgstr ""
 "hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
 "en större chans att samla ihop en tillräcklig mängd slumpmässig data.\n"
 
-#: ../g10/keygen.c:3028
-#: ../g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: ../g10/keygen.c:3260
-#: ../g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver den publika nyckeln till \"%s\"\n"
 
-#: ../g10/keygen.c:3262
-#: ../g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemliga nyckelstumpen till \"%s\"\n"
 
-#: ../g10/keygen.c:3265
-#: ../g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: ../g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
 
-#: ../g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbar hemlig nyckelring hittades: %s\n"
 
-#: ../g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
 
-#: ../g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: ../g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "den publika och den hemliga nyckeln är skapade och signerade.\n"
 
 # Flagga.. inte kommando
-#: ../g10/keygen.c:3487
+#: g10/keygen.c:3495
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Observera att denna nyckel inte kan användas för kryptering. Du kanske\n"
-"vill använda flaggan \"--edit-key\" för att skapa en undernyckel för detta syfte.\n"
+"vill använda flaggan \"--edit-key\" för att skapa en undernyckel för detta "
+"syfte.\n"
 
-#: ../g10/keygen.c:3500
-#: ../g10/keygen.c:3645
-#: ../g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: ../g10/keygen.c:3555
-#: ../g10/keygen.c:3696
-#: ../g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: ../g10/keygen.c:3557
-#: ../g10/keygen.c:3698
-#: ../g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: ../g10/keygen.c:3568
-#: ../g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
 
-#: ../g10/keygen.c:3609
-#: ../g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 msgid "Really create? (y/N) "
 msgstr "Verkligen skapa? (j/N) "
 
-#: ../g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "misslyckades med att lagra nyckeln på kortet: %s\n"
 
-#: ../g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
 
-#: ../g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
 
-#: ../g10/keyid.c:538
-#: ../g10/keyid.c:550
-#: ../g10/keyid.c:562
-#: ../g10/keyid.c:574
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "aldrig"
 
-#: ../g10/keylist.c:267
+#: g10/keylist.c:267
 msgid "Critical signature policy: "
 msgstr "Viktig signaturpolicy: "
 
-#: ../g10/keylist.c:269
+#: g10/keylist.c:269
 msgid "Signature policy: "
 msgstr "Signaturpolicy: "
 
-#: ../g10/keylist.c:308
+#: g10/keylist.c:308
 msgid "Critical preferred keyserver: "
 msgstr "Föredragen kritisk nyckelserver: "
 
-#: ../g10/keylist.c:361
+#: g10/keylist.c:361
 msgid "Critical signature notation: "
 msgstr "Kritisk signaturnotation: "
 
-#: ../g10/keylist.c:363
+#: g10/keylist.c:363
 msgid "Signature notation: "
 msgstr "Signaturnotation: "
 
-#: ../g10/keylist.c:473
+#: g10/keylist.c:473
 msgid "Keyring"
 msgstr "Nyckelring"
 
-#: ../g10/keylist.c:1504
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: ../g10/keylist.c:1506
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "   Undernyckelns fingeravtryck:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: ../g10/keylist.c:1513
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: ../g10/keylist.c:1515
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "   Undernyckelns fingeravtryck:"
 
-#. use tty
-#: ../g10/keylist.c:1519
-#: ../g10/keylist.c:1523
+#: g10/keylist.c:1519 g10/keylist.c:1523
 msgid "      Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
-#. Handled elsewhere.
-#: ../g10/keylist.c:1590
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr "       Kortets serienr ="
 
-#: ../g10/keyring.c:1249
+#: g10/keyring.c:1249
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
 
 # Enligt Werner uppstår detta om något går snett när den hemliga nyckeln uppdateras.
-#: ../g10/keyring.c:1254
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
 
-#: ../g10/keyring.c:1256
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s är den oförändrade\n"
 
-#: ../g10/keyring.c:1257
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s är den nya\n"
 
-#: ../g10/keyring.c:1258
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Lös detta potentiella säkerhetsproblem\n"
 
-#: ../g10/keyring.c:1380
+#: g10/keyring.c:1380
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "mellanlagrar nyckelringen \"%s\"\n"
 
-#: ../g10/keyring.c:1426
+#: g10/keyring.c:1426
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu nycklar mellanlagrade än så länge (%lu signaturer)\n"
 
-#: ../g10/keyring.c:1438
+#: g10/keyring.c:1438
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu nycklar mellanlagrade (%lu signaturer)\n"
 
-#: ../g10/keyring.c:1510
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: ../g10/keyserver.c:71
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr "inkludera spärrade nycklar i sökresultatet"
 
-#: ../g10/keyserver.c:72
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr "inkludera undernycklar vid sökning efter nyckel-id"
 
-#: ../g10/keyserver.c:74
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
-msgstr "använd temporärfiler för att skicka data till nyckelserverns hjälpprogram"
+msgstr ""
+"använd temporärfiler för att skicka data till nyckelserverns hjälpprogram"
 
-#: ../g10/keyserver.c:76
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr "ta inte bort temporärfiler efter de använts"
 
-#: ../g10/keyserver.c:80
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "hämta automatiskt nycklar vid validering av signaturer"
 
-#: ../g10/keyserver.c:82
+#: g10/keyserver.c:82
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "respektera föredragen nyckelserver-url inställd i nyckeln"
 
-#: ../g10/keyserver.c:84
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "respektera PKA-posten inställd på en nyckel när nycklar hämtas"
 
-#: ../g10/keyserver.c:150
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
-msgstr "VARNING: nyckelserverflaggan \"%s\" används inte på den här plattformen\n"
+msgstr ""
+"VARNING: nyckelserverflaggan \"%s\" används inte på den här plattformen\n"
 
-#: ../g10/keyserver.c:541
+#: g10/keyserver.c:541
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: ../g10/keyserver.c:742
+#: g10/keyserver.c:742
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Ange nummer, N)ästa, eller Q) för Avsluta > "
 
-#: ../g10/keyserver.c:826
-#: ../g10/keyserver.c:1448
+#: g10/keyserver.c:826 g10/keyserver.c:1448
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ogiltigt nyckelserverprotokoll (vi %d!=hanterare %d)\n"
 
-#: ../g10/keyserver.c:924
+#: g10/keyserver.c:924
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
 
-#: ../g10/keyserver.c:926
+#: g10/keyserver.c:926
 msgid "key not found on keyserver\n"
 msgstr "nyckeln hittades inte på nyckelservern\n"
 
-#: ../g10/keyserver.c:1167
+#: g10/keyserver.c:1167
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "begär nyckeln %s från %s-servern %s\n"
 
-#: ../g10/keyserver.c:1171
+#: g10/keyserver.c:1171
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckeln %s från %s\n"
 
-#: ../g10/keyserver.c:1195
+#: g10/keyserver.c:1195
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "söker efter namn från %s-servern %s\n"
 
-#: ../g10/keyserver.c:1198
+#: g10/keyserver.c:1198
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "söker efter namn från %s\n"
 
-#: ../g10/keyserver.c:1351
+#: g10/keyserver.c:1351
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "skickar nyckeln %s till %s-servern %s\n"
 
-#: ../g10/keyserver.c:1355
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "skickar nyckeln %s till %s\n"
 
-#: ../g10/keyserver.c:1398
+#: g10/keyserver.c:1398
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "söker efter \"%s\" från %s-servern %s\n"
 
-#: ../g10/keyserver.c:1401
+#: g10/keyserver.c:1401
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "söker efter \"%s\" från %s\n"
 
-#: ../g10/keyserver.c:1408
-#: ../g10/keyserver.c:1504
+#: g10/keyserver.c:1408 g10/keyserver.c:1504
 msgid "no keyserver action!\n"
 msgstr "ingen nyckelserveråtgärd!\n"
 
-#: ../g10/keyserver.c:1456
+#: g10/keyserver.c:1456
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VARNING: nyckelserverhanteraren från en annan version av GnuPG (%s)\n"
 
-#: ../g10/keyserver.c:1465
+#: g10/keyserver.c:1465
 msgid "keyserver did not send VERSION\n"
 msgstr "nyckelserver skickade inte VERSION\n"
 
-#: ../g10/keyserver.c:1527
-#: ../g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2062
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
 
-#: ../g10/keyserver.c:1533
+#: g10/keyserver.c:1533
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "externa anrop till nyckelserver stöds inte i detta bygge\n"
 
-#: ../g10/keyserver.c:1545
+#: g10/keyserver.c:1545
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "ingen hanterare för nyckelserverschemat \"%s\"\n"
 
-#: ../g10/keyserver.c:1550
+#: g10/keyserver.c:1550
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "åtgärden \"%s\" stöds inte med nyckelserverschemat \"%s\"\n"
 
-#: ../g10/keyserver.c:1558
+#: g10/keyserver.c:1558
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s har inte stöd för hanterarversionen %d\n"
 
-#: ../g10/keyserver.c:1565
+#: g10/keyserver.c:1565
 msgid "keyserver timed out\n"
 msgstr "tidsgräns överstigen för nyckelserver\n"
 
-#: ../g10/keyserver.c:1570
+#: g10/keyserver.c:1570
 msgid "keyserver internal error\n"
 msgstr "internt fel i nyckelserver\n"
 
-#: ../g10/keyserver.c:1579
+#: g10/keyserver.c:1579
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "kommunikationsfel mot nyckelserver: %s\n"
 
-#: ../g10/keyserver.c:1604
-#: ../g10/keyserver.c:1638
+#: g10/keyserver.c:1604 g10/keyserver.c:1638
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
 
-#: ../g10/keyserver.c:1897
+#: g10/keyserver.c:1897
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VARNING: kunde inte uppdatera nyckeln %s via %s: %s\n"
 
-#: ../g10/keyserver.c:1919
+#: g10/keyserver.c:1919
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "uppdaterar 1 nyckel från %s\n"
 
-#: ../g10/keyserver.c:1921
+#: g10/keyserver.c:1921
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "uppdaterar %d nycklar från %s\n"
 
-#: ../g10/keyserver.c:1977
+#: g10/keyserver.c:1977
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
 
-#: ../g10/keyserver.c:1983
+#: g10/keyserver.c:1983
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VARNING: kunde inte tolka uri:n %s\n"
 
-#: ../g10/mainproc.c:231
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
 
-#: ../g10/mainproc.c:284
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s krypterad sessionsnyckel\n"
 
-#: ../g10/mainproc.c:294
+#: g10/mainproc.c:294
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "lösenfras genererad med okänd sammandragsalgoritm %d\n"
 
-#: ../g10/mainproc.c:360
+#: g10/mainproc.c:360
 #, c-format
 msgid "public key is %s\n"
 msgstr "publik nyckel är %s\n"
 
 # Men jag ändrade så det blev närmare originalet. Per
-#: ../g10/mainproc.c:423
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat med publik nyckel: korrekt DEK\n"
 
-#: ../g10/mainproc.c:456
+#: g10/mainproc.c:456
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, id %s, skapad %s\n"
 
-#: ../g10/mainproc.c:460
-#: ../g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: ../g10/mainproc.c:464
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypterad med %s-nyckel, id %s\n"
 
 # Motsatsen till kryptering med symmetrisk nyckel.
-#: ../g10/mainproc.c:478
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: ../g10/mainproc.c:492
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenfraser\n"
 
-#: ../g10/mainproc.c:494
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenfras\n"
 
-#: ../g10/mainproc.c:526
-#: ../g10/mainproc.c:548
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
 
-#: ../g10/mainproc.c:534
+#: g10/mainproc.c:534
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr "IDEA-chiffer är inte tillgängligt. Försöker optimistiskt att använda %s istället\n"
+msgstr ""
+"IDEA-chiffer är inte tillgängligt. Försöker optimistiskt att använda %s "
+"istället\n"
 
-#: ../g10/mainproc.c:567
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
 # Äldre krypteringalgoritmer skapar ingen mdc dvs. "minisignatur" som skyddar mot att delar av den krypterade texten byts ut/tas bort. Alla nya 128-bitars algoritmer använder mdc: AES, AES192, AES256, BLOWFISH.
-#: ../g10/mainproc.c:571
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
 
 # Meddelandet innebär alltså att kontrollen av mdc visade att meddelandet förändrats/manipulerats sedan det krypterades. Block kan ha tagits bort eller bytts ut.
-#: ../g10/mainproc.c:584
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: ../g10/mainproc.c:590
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: ../g10/mainproc.c:611
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
 
-#: ../g10/mainproc.c:613
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: ../g10/mainproc.c:701
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "VARNING: multipla klartexter har påträffats\n"
 
-#: ../g10/mainproc.c:842
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "fristående spärrcertifikat - använd \"gpg --import\" för\n"
 "att verkställa\n"
 
-#: ../g10/mainproc.c:1195
-#: ../g10/mainproc.c:1232
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 msgid "no signature found\n"
 msgstr "ingen signatur hittades\n"
 
-#: ../g10/mainproc.c:1470
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "signaturvalidering utlämnad\n"
 
-#: ../g10/mainproc.c:1579
+#: g10/mainproc.c:1579
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera detta tvetydliga signaturdata\n"
 
-#: ../g10/mainproc.c:1590
+#: g10/mainproc.c:1590
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur gjord %s\n"
 
-#: ../g10/mainproc.c:1591
+#: g10/mainproc.c:1591
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "             med %s-nyckeln %s\n"
 
-#: ../g10/mainproc.c:1595
+#: g10/mainproc.c:1595
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur gjordes %s med %s nyckel-id %s\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
-#: ../g10/mainproc.c:1615
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: ../g10/mainproc.c:1748
-#: ../g10/mainproc.c:1796
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: ../g10/mainproc.c:1750
-#: ../g10/mainproc.c:1798
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgången signatur från \"%s\""
 
-#: ../g10/mainproc.c:1752
-#: ../g10/mainproc.c:1800
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \"%s\""
 
 # Visas vid ogiltig signatur:
 # Eftersom signaturen är ogiltig kan man inte vara säker på att angivet namn och nyckel-id är riktigt.
-#: ../g10/mainproc.c:1802
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: ../g10/mainproc.c:1834
+#: g10/mainproc.c:1834
 #, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \"%s\""
 
-#: ../g10/mainproc.c:1932
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: ../g10/mainproc.c:1937
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: ../g10/mainproc.c:1940
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: ../g10/mainproc.c:1941
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "binär"
 
-#: ../g10/mainproc.c:1942
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "textläge"
 
-#: ../g10/mainproc.c:1942
-#: ../g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "okänd"
 
-#: ../g10/mainproc.c:1962
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte kontrollera signaturen: %s\n"
 
-#: ../g10/mainproc.c:2046
-#: ../g10/mainproc.c:2062
-#: ../g10/mainproc.c:2158
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: ../g10/mainproc.c:2089
-msgid "WARNING: multiple signatures detected.  Only the first will be checked.\n"
-msgstr "VARNING: multipla signaturer upptäckta. Endast den första kommer att kontrolleras.\n"
+#: g10/mainproc.c:2089
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+"VARNING: multipla signaturer upptäckta. Endast den första kommer att "
+"kontrolleras.\n"
 
-#: ../g10/mainproc.c:2097
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: ../g10/mainproc.c:2162
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: ../g10/mainproc.c:2172
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ogiltigt rotpaket hittades i proc_tree()\n"
 
-#: ../g10/misc.c:109
-#: ../g10/misc.c:137
-#: ../g10/misc.c:209
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat för \"%s\" misslyckades i %s: %s\n"
 
-#: ../g10/misc.c:174
+#: g10/misc.c:174
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) misslyckades i %s: %s\n"
 
-#: ../g10/misc.c:288
+#: g10/misc.c:288
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "VARNING: använder experimentella algoritmen %s för publik nyckel\n"
 
-#: ../g10/misc.c:294
+#: g10/misc.c:294
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "VARNING: Elgamal-nycklar för kryptering/signering är föråldrade\n"
 
-#: ../g10/misc.c:307
+#: g10/misc.c:307
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "VARNING: använder experimentella chifferalgoritmen %s\n"
 
-#: ../g10/misc.c:322
+#: g10/misc.c:322
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "VARNING: använder experimentella sammandragsalgoritmen %s\n"
 
-#: ../g10/misc.c:327
+#: g10/misc.c:327
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
 
-#: ../g10/misc.c:504
+#: g10/misc.c:504
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "insticksmodul för IDEA-chiffer är inte installerat\n"
 
-#: ../g10/misc.c:505
-#: ../g10/sig-check.c:107
-#: ../jnlib/utf8conv.c:87
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "se %s för mer information\n"
 
-#: ../g10/misc.c:740
+#: g10/misc.c:740
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: flaggan är föråldrad \"%s\"\n"
 
-#: ../g10/misc.c:744
+#: g10/misc.c:744
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: ../g10/misc.c:746
+#: g10/misc.c:746
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Använd \"%s%s\" istället\n"
 
-#: ../g10/misc.c:753
+#: g10/misc.c:753
 #, 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:763
+#: g10/misc.c:763
 #, 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:766
+#: g10/misc.c:766
 #, 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:827
+#: g10/misc.c:827
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../g10/misc.c:852
+#: g10/misc.c:852
 msgid "uncompressed|none"
 msgstr "okomprimerad|ingen"
 
-#: ../g10/misc.c:979
+#: g10/misc.c:979
 #, 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:1154
+#: g10/misc.c:1154
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "tvetydlig flagga \"%s\"\n"
 
-#: ../g10/misc.c:1179
+#: g10/misc.c:1179
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "okänd flagga \"%s\"\n"
 
-#. do not overwrite
-#: ../g10/openfile.c:89
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Filen \"%s\" finns. "
 
-#: ../g10/openfile.c:93
+#: g10/openfile.c:93
 msgid "Overwrite? (y/N) "
 msgstr "Skriv över? (j/N) "
 
-#: ../g10/openfile.c:126
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: okänt suffix\n"
 
-#: ../g10/openfile.c:150
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Ange nytt filnamn"
 
-#: ../g10/openfile.c:195
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "skriver till standard ut\n"
 
-#: ../g10/openfile.c:316
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar att signerad data finns i filen \"%s\"\n"
 
-#: ../g10/openfile.c:395
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "ny konfigurationsfil \"%s\" skapad\n"
 
-#: ../g10/openfile.c:397
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgstr "VARNING: inställningar i \"%s\" är ännu inte aktiva under denna körning\n"
+msgstr ""
+"VARNING: inställningar i \"%s\" är ännu inte aktiva under denna körning\n"
 
-#: ../g10/parse-packet.c:191
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritmen %d för publika nycklar\n"
 
-#: ../g10/parse-packet.c:796
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 
-#: ../g10/parse-packet.c:1247
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
 
-#: ../g10/passphrase.c:295
-#: ../g10/passphrase.c:583
+#: g10/passphrase.c:295 g10/passphrase.c:583
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (primära nyckelns id %s)"
 
-#: ../g10/passphrase.c:309
+#: g10/passphrase.c:309
 #, c-format
 msgid ""
-"Please enter the passphrase to unlock the secret key for the OpenPGP certificate:\n"
+"Please enter the passphrase to unlock the secret key for the OpenPGP "
+"certificate:\n"
 "\"%.*s\"\n"
 "%u-bit %s key, ID %s,\n"
 "created %s%s.\n"
 msgstr ""
-"Ange lösenfrasen för att låsa upp den hemliga nyckeln för OpenPGP-certifikatet:\n"
+"Ange lösenfrasen för att låsa upp den hemliga nyckeln för OpenPGP-"
+"certifikatet:\n"
 "\"%.*s\"\n"
 "%u-bitars %s-nyckel, ID %s,\n"
 "skapad %s%s.\n"
 
-#: ../g10/passphrase.c:335
+#: g10/passphrase.c:335
 msgid "Repeat passphrase\n"
 msgstr "Repetera lösenfrasen\n"
 
-#: ../g10/passphrase.c:337
+#: g10/passphrase.c:337
 msgid "Enter passphrase\n"
 msgstr "Ange lösenfrasen\n"
 
-#: ../g10/passphrase.c:364
+#: g10/passphrase.c:364
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: ../g10/passphrase.c:370
-#: ../g10/passphrase.c:429
+#: g10/passphrase.c:370 g10/passphrase.c:429
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem med agenten: %s\n"
 
-#: ../g10/passphrase.c:562
+#: g10/passphrase.c:562
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5571,17 +5285,17 @@ msgstr ""
 "Du behöver en lösenfras för att låsa upp den hemliga\n"
 "nyckeln för användaren: \"%s\"\n"
 
-#: ../g10/passphrase.c:570
+#: g10/passphrase.c:570
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitars %s-nyckel, id %s, skapad %s"
 
-#: ../g10/passphrase.c:579
+#: g10/passphrase.c:579
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (undernyckel på primärt nyckel-id %s)"
 
-#: ../g10/photoid.c:72
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5595,131 +5309,116 @@ msgstr ""
 "en mycket stor bild, så blir din nyckel också väldigt stor!\n"
 "Försök att använda en bild som har ungefär  formatet 240x288 pixlar.\n"
 
-#: ../g10/photoid.c:94
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Skriv JPEG-filnamnet för foto-id: "
 
-#: ../g10/photoid.c:115
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "kunde inte öppna JPEG-filen \"%s\": %s\n"
 
-#: ../g10/photoid.c:126
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Den här JPEG-bilden är verkligen stor (%d byte)!\n"
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: ../g10/photoid.c:128
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Vill du verkligen använda den? (j/N)? "
 
-#: ../g10/photoid.c:145
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" är inte en JPEG-fil\n"
 
-#: ../g10/photoid.c:164
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Är detta foto korrekt (j/N/a)? "
 
-#: ../g10/photoid.c:368
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "kan inte visa foto-id!\n"
 
-#: ../g10/pkclist.c:60
-#: ../g10/revoke.c:623
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Ingen anledning har angivits"
 
 # tveksam översättning. funderar på "ersatt av något bättre" men det
 # känns inte heller bra. Betyder att nyckeln inte används längre, utan användaren har skapat en ny nyckel som ersätter den gamla.
-#: ../g10/pkclist.c:62
-#: ../g10/revoke.c:625
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Nyckeln är åsidosatt"
 
-#: ../g10/pkclist.c:64
-#: ../g10/revoke.c:624
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Nyckeln har blivit komprometterad"
 
-#: ../g10/pkclist.c:66
-#: ../g10/revoke.c:626
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Nyckeln används inte längre"
 
-#: ../g10/pkclist.c:68
-#: ../g10/revoke.c:627
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Användaridentiteten är inte längre giltig"
 
-#: ../g10/pkclist.c:72
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "anledning för spärrning: "
 
-#: ../g10/pkclist.c:89
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "spärrningskommentar: "
 
 # ej kristallklart vad förkortningarna står för
-#. A string with valid answers.
-#.
-#. Note to translators: These are the allowed answers in lower and
-#. uppercase.  Below you will find the matching strings which
-#. should be translated accordingly and the letter changed to
-#. match the one in the answer string.
-#.
-#. i = please show me more information
-#. m = back to the main menu
-#. s = skip this key
-#. q = quit
-#.
-#: ../g10/pkclist.c:204
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImHhAsS"
 
-#: ../g10/pkclist.c:212
+#: g10/pkclist.c:212
 msgid "No trust value assigned to:\n"
 msgstr "Inget tillitsvärde tilldelat till:\n"
 
-#: ../g10/pkclist.c:244
+#: g10/pkclist.c:244
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  även känd som \"%s\"\n"
 
-#: ../g10/pkclist.c:254
-msgid "How much do you trust that this key actually belongs to the named user?\n"
-msgstr "Hur mycket litar du på att nyckeln faktiskt tillhör den angivna användaren?\n"
+#: g10/pkclist.c:254
+msgid ""
+"How much do you trust that this key actually belongs to the named user?\n"
+msgstr ""
+"Hur mycket litar du på att nyckeln faktiskt tillhör den angivna användaren?\n"
 
-#: ../g10/pkclist.c:269
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = Jag vet inte eller kan inte säga något\n"
 
-#: ../g10/pkclist.c:271
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = Jag litar INTE\n"
 
-#: ../g10/pkclist.c:277
+#: g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = Jag litar förbehållslöst\n"
 
-#: ../g10/pkclist.c:283
+#: g10/pkclist.c:283
 msgid "  m = back to the main menu\n"
 msgstr "  h = gå tillbaka till huvudmenyn\n"
 
-#: ../g10/pkclist.c:286
+#: g10/pkclist.c:286
 msgid "  s = skip this key\n"
 msgstr "  s = hoppa över denna nyckel\n"
 
-#: ../g10/pkclist.c:287
+#: g10/pkclist.c:287
 msgid "  q = quit\n"
 msgstr "  a = avsluta\n"
 
-#: ../g10/pkclist.c:291
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5728,38 +5427,40 @@ msgstr ""
 "Minimum tillitsnivå för denna nyckel är: %s\n"
 "\n"
 
-#: ../g10/pkclist.c:297
-#: ../g10/revoke.c:652
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Vad väljer du? "
 
-#: ../g10/pkclist.c:318
+#: g10/pkclist.c:318
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vill du verkligen ge denna nyckel förbehållslöst förtroende? (j/N) "
 
-#: ../g10/pkclist.c:332
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifikat som leder till en nyckel med förbehållslöst förtroende:\n"
 
-#: ../g10/pkclist.c:417
+#: g10/pkclist.c:417
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
-msgstr "%s: Det finns inget som säger att nyckeln tillhör den angivna användaren\n"
+msgstr ""
+"%s: Det finns inget som säger att nyckeln tillhör den angivna användaren\n"
 
-#: ../g10/pkclist.c:422
+#: g10/pkclist.c:422
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
-msgstr "%s: Det finns viss information om att nyckeln tillhör den angivna användaren\n"
+msgstr ""
+"%s: Det finns viss information om att nyckeln tillhör den angivna "
+"användaren\n"
 
-#: ../g10/pkclist.c:428
+#: g10/pkclist.c:428
 msgid "This key probably belongs to the named user\n"
 msgstr "Den här nyckel tillhör antagligen den namngivna användaren\n"
 
-#: ../g10/pkclist.c:433
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Denna nyckel tillhör oss\n"
 
-#: ../g10/pkclist.c:459
+#: g10/pkclist.c:459
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5769,110 +5470,109 @@ msgstr ""
 "användaridentiteten. Om du *verkligen* vet vad du gör, kan du svara\n"
 "ja på nästkommande fråga.\n"
 
-#: ../g10/pkclist.c:478
+#: g10/pkclist.c:478
 msgid "Use this key anyway? (y/N) "
 msgstr "Vill du använda nyckeln ändå? (j/N) "
 
-#: ../g10/pkclist.c:512
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
 
-#: ../g10/pkclist.c:519
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VARNING: denna nyckel kan ha spärrats (spärrnyckeln saknas)\n"
 
-#: ../g10/pkclist.c:528
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
-#: ../g10/pkclist.c:531
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VARNING: Denna nyckel har spärrats av sin ägare!\n"
 
-#: ../g10/pkclist.c:532
+#: g10/pkclist.c:532
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Detta kan betyda att signaturen är förfalskad.\n"
 
-#: ../g10/pkclist.c:538
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VARNING: Denna undernyckel har spärrats av sin ägare!\n"
 
-#: ../g10/pkclist.c:543
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Obs: Denna nyckel har stängts av.\n"
 
-#: ../g10/pkclist.c:563
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "Observera: Validerad adress för signeraren är \"%s\"\n"
 
-#: ../g10/pkclist.c:570
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "Observera: Signerarens adress \"%s\" matchar inte DNS-objektet\n"
 
-#: ../g10/pkclist.c:582
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "trustlevel justerad till FULL på grund av giltig PKA-info\n"
 
-#: ../g10/pkclist.c:590
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "trustlevel justerad till NEVER på grund av felaktig PKA-info\n"
 
-#: ../g10/pkclist.c:601
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Obs: Giltighetstiden för denna nyckel har gått ut!\n"
 
-#: ../g10/pkclist.c:612
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
 
-#: ../g10/pkclist.c:614
-msgid "         There is no indication that the signature belongs to the owner.\n"
-msgstr "         Det finns inget som indikerar att signaturen tillhör ägaren.\n"
+#: g10/pkclist.c:614
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr ""
+"         Det finns inget som indikerar att signaturen tillhör ägaren.\n"
 
-#: ../g10/pkclist.c:622
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VARNING: Vi litar INTE på denna nyckel!\n"
 
-#: ../g10/pkclist.c:623
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen är sannolikt en FÖRFALSKNING.\n"
 
-#: ../g10/pkclist.c:631
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+#: g10/pkclist.c:631
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VARNING: Denna nyckel är inte certifierad med signaturer med ett\n"
 "tillräckligt högt tillitsvärde!\n"
 
-#: ../g10/pkclist.c:633
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det är inte säkert att signaturen tillhör ägaren.\n"
 
-#: ../g10/pkclist.c:832
-#: ../g10/pkclist.c:874
-#: ../g10/pkclist.c:1086
-#: ../g10/pkclist.c:1156
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: hoppade över: %s\n"
 
 # överhoppad?
-#: ../g10/pkclist.c:844
-#: ../g10/pkclist.c:1124
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppades över: publik nyckel finns redan\n"
 
-#: ../g10/pkclist.c:895
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Du angav ingen användaridentitet. (du kan använda \"-r\")\n"
 
-#: ../g10/pkclist.c:919
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr "Nuvarande mottagare:\n"
 
-#: ../g10/pkclist.c:945
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5880,29 +5580,29 @@ msgstr ""
 "\n"
 "Ange användaridentiteten.  Avsluta med en tom rad: "
 
-#: ../g10/pkclist.c:970
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Ingen sådan användaridentitet.\n"
 
-#: ../g10/pkclist.c:979
-#: ../g10/pkclist.c:1053
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
-msgstr "hoppade över: den publika nyckeln är redan inställd som standardmottagare\n"
+msgstr ""
+"hoppade över: den publika nyckeln är redan inställd som standardmottagare\n"
 
-#: ../g10/pkclist.c:1000
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Den publika nyckeln är inaktiverad.\n"
 
-#: ../g10/pkclist.c:1009
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "hoppade över: publik nyckel redan angiven\n"
 
-#: ../g10/pkclist.c:1044
+#: g10/pkclist.c:1044
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "okänd standardmottagare \"%s\"\n"
 
-#: ../g10/pkclist.c:1102
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
@@ -5910,109 +5610,106 @@ msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
 # plural av adressee
 # dvs. den som meddelandet är adresserat till.
 # Åtskillnad görs mellan adressee och receiver.
-#: ../g10/pkclist.c:1164
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "inga giltiga adressater\n"
 
-#: ../g10/pkclist.c:1478
+#: g10/pkclist.c:1478
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Observera: nyckeln %s har ingen %s-förmåga\n"
 
-#: ../g10/pkclist.c:1503
+#: g10/pkclist.c:1503
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Observera: nyckeln %s har ingen inställning för %s\n"
 
-#: ../g10/plaintext.c:95
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data sparades inte, använd flaggan \"--output\" för att spara det\n"
 
-#: ../g10/plaintext.c:472
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Signatur i en separat fil.\n"
 
-#: ../g10/plaintext.c:479
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Ange namnet på datafilen: "
 
-#: ../g10/plaintext.c:511
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "läser från standard in ...\n"
 
-#: ../g10/plaintext.c:549
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "ingen signerad data\n"
 
 # se förra kommentaren
-#: ../g10/plaintext.c:565
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte öppna signerat data \"%s\"\n"
 
 # se förra kommentaren
-#: ../g10/plaintext.c:599
+#: g10/plaintext.c:599
 #, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kan inte öppna signerad data fd=%d: %s\n"
 
-#: ../g10/pubkey-enc.c:105
+#: g10/pubkey-enc.c:105
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonym mottagare; provar med den hemliga nyckeln %s ...\n"
 
-#: ../g10/pubkey-enc.c:136
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, vi är den anonyma mottagaren.\n"
 
-#: ../g10/pubkey-enc.c:225
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammal kodning av krypteringsnyckeln stöds inte\n"
 
-#: ../g10/pubkey-enc.c:246
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "chifferalgoritmen %d%s är okänd eller inaktiverad\n"
 
-#: ../g10/pubkey-enc.c:284
+#: g10/pubkey-enc.c:284
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "VARNING: chifferalgoritmen %s hittades inte i mottagarinställningarna\n"
+msgstr ""
+"VARNING: chifferalgoritmen %s hittades inte i mottagarinställningarna\n"
 
-#: ../g10/pubkey-enc.c:304
+#: g10/pubkey-enc.c:304
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "OBSERVERA: hemliga nyckeln %s gick ut %s\n"
 
-#: ../g10/pubkey-enc.c:310
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "OBSERVERA: nyckeln har spärrats"
 
 # Vad?
-#: ../g10/revoke.c:102
-#: ../g10/revoke.c:116
-#: ../g10/revoke.c:128
-#: ../g10/revoke.c:174
-#: ../g10/revoke.c:186
-#: ../g10/revoke.c:587
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet misslyckades: %s\n"
 
-#: ../g10/revoke.c:145
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "nyckeln %s har inga användaridentiteter\n"
 
-#: ../g10/revoke.c:306
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Kommer att spärras av:\n"
 
-#: ../g10/revoke.c:310
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Detta är en känslig spärrnyckel)\n"
 
-#: ../g10/revoke.c:314
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 
@@ -6021,56 +5718,52 @@ msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 # -do-not-force översatt med:
 # genomdriv inte
 # I detta fall gäller det ett revokeringscertifikat, som gnupg alltid skapar i ASCII-format för att det ska gå att skriva ut.
-#: ../g10/revoke.c:327
-#: ../g10/revoke.c:553
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "utdata med ett ascii-skal genomdrivet.\n"
 
 # Vad menas???
-#: ../g10/revoke.c:342
-#: ../g10/revoke.c:567
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet misslyckades: %s\n"
 
-#. and issue a usage notice
-#: ../g10/revoke.c:405
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Spärrcertifikat skapat.\n"
 
-#: ../g10/revoke.c:411
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "inga spärrnycklar hittades för \"%s\"\n"
 
-#: ../g10/revoke.c:470
+#: g10/revoke.c:470
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
 
-#: ../g10/revoke.c:499
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "ingen motsvarande publik nyckel: %s\n"
 
-#: ../g10/revoke.c:510
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "publik nyckel passar inte ihop med den hemliga nyckeln!\n"
 
-#: ../g10/revoke.c:517
+#: g10/revoke.c:517
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 
-#: ../g10/revoke.c:534
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "okänd skyddsalgoritm\n"
 
-#: ../g10/revoke.c:542
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "OBS: Denna nyckel är oskyddad!\n"
 
-#. and issue a usage notice
-#: ../g10/revoke.c:593
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -6088,248 +5781,262 @@ msgstr ""
 "media blir oläsligt.  Men se upp:  Utskriftsfunktionen på\n"
 "din dator kan spara data så att det blir åtkomligt för andra!\n"
 
-#: ../g10/revoke.c:635
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Välj anledning till varför nyckeln spärras:\n"
 
-#: ../g10/revoke.c:645
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../g10/revoke.c:647
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Troligen vill du välja %d här)\n"
 
-#: ../g10/revoke.c:688
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ange en valfri beskrivning; avsluta med en tom rad:\n"
 
-#: ../g10/revoke.c:716
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Anledning för spärrning: %s\n"
 
-#: ../g10/revoke.c:718
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Ingen beskrivning angiven)\n"
 
-#: ../g10/revoke.c:723
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "Är detta OK? (j/N) "
 
-#: ../g10/seckey-cert.c:55
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "de hemliga nyckeldelarna är inte tillgängliga\n"
 
-#: ../g10/seckey-cert.c:61
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "skyddsalgoritmen %d%s stöds inte\n"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: ../g10/seckey-cert.c:72
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "skyddssammandraget %d stöds inte\n"
 
-#: ../g10/seckey-cert.c:291
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Ogiltig lösenfras; försök igen"
 
-#: ../g10/seckey-cert.c:292
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
 # För vissa krypteringsalgoritmer är det känt att vissa svaga nycklar kan förekomma. Dessa ska aldrig användas. GnuPG vill på detta sätt hindra dig från att skapa en sådan nyckel.
-#: ../g10/seckey-cert.c:361
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VARNING: Upptäckte en svag nyckel - byt lösenfras igen.\n"
 
-#: ../g10/seckey-cert.c:404
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr "skapar den föråldrade 16-bit kontrollsumman för skydd av den hemliga nyckeln\n"
+msgstr ""
+"skapar den föråldrade 16-bit kontrollsumman för skydd av den hemliga "
+"nyckeln\n"
 
-#: ../g10/seskey.c:61
-#: ../sm/encrypt.c:119
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "skapade en svag nyckel - försöker igen\n"
 
-#: ../g10/seskey.c:65
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "kan inte undvika en svag nyckel för symmetriskt chiffer;\n"
 "försökte %d gånger!\n"
 
-#: ../g10/seskey.c:227
-#: ../sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA kräver att hashlängden är delbar med 8 bitar\n"
 
-#: ../g10/seskey.c:240
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr "DSA-nyckeln %s använder en osäker hash (%u bitar)\n"
 
-#: ../g10/seskey.c:252
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr "DSA-nyckeln %s kräver en hash med %u bitar eller större\n"
 
-#. Sanity check that the md has a context for the hash that the
-#. sig is expecting.  This can happen if a onepass sig header does
-#. not match the actual sig, and also if the clearsign "Hash:"
-#. header is missing or does not match the actual sig.
-#: ../g10/sig-check.c:80
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VARNING: konflikt mellan signatursammandrag i meddelandet\n"
 
 # Vad betyder det?
-#: ../g10/sig-check.c:105
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VARNING: signeringsundernyckeln %s är inte korscertifierad\n"
 
 # cross-certification?
-#: ../g10/sig-check.c:117
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "VARNING signeringsundernyckel  %s har en ogiltig korscertifiering\n"
 
 # behövs verkligen c-format här?
-#: ../g10/sig-check.c:189
+#: g10/sig-check.c:189
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
 
-#: ../g10/sig-check.c:190
+#: g10/sig-check.c:190
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "den publika nyckeln %s är %lu sekunder nyare än signaturen\n"
 
 # c-format behövs inte i singularis
-#: ../g10/sig-check.c:201
+#: g10/sig-check.c:201
 #, c-format
-msgid "key %s was created %lu second in the future (time warp or clock problem)\n"
-msgstr "nyckeln %s skapades %lu sekund in i framtiden (tidsresande eller felinställd klocka)\n"
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr ""
+"nyckeln %s skapades %lu sekund in i framtiden (tidsresande eller felinställd "
+"klocka)\n"
 
-#: ../g10/sig-check.c:203
+#: g10/sig-check.c:203
 #, c-format
-msgid "key %s was created %lu seconds in the future (time warp or clock problem)\n"
-msgstr "nyckeln %s skapades %lu sekunder in i framtiden (tidsresande eller felinställd klocka)\n"
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr ""
+"nyckeln %s skapades %lu sekunder in i framtiden (tidsresande eller "
+"felinställd klocka)\n"
 
-#: ../g10/sig-check.c:213
+#: g10/sig-check.c:213
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "OBSERVERA: signaturnyckeln %s gick ut %s\n"
 
-#: ../g10/sig-check.c:226
+#: g10/sig-check.c:226
 #, c-format
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "OBSERVERA: signaturnyckeln %s har spärrats\n"
 
-#: ../g10/sig-check.c:302
+#: g10/sig-check.c:302
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
-msgstr "antar felaktig signatur från nyckeln %s på grund av en okänd kritisk bit\n"
+msgstr ""
+"antar felaktig signatur från nyckeln %s på grund av en okänd kritisk bit\n"
 
-#: ../g10/sig-check.c:567
+#: g10/sig-check.c:567
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "nyckel %s: ingen undernyckel med spärrsignatur för undernyckel\n"
 
-#: ../g10/sig-check.c:594
+#: g10/sig-check.c:594
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "nyckeln %s: ingen undernyckel för signaturbindning av undernyckel\n"
 
-#: ../g10/sign.c:89
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
-msgstr "VARNING: kan inte %%-expandera anteckning (för stor).  Använder den utan expansion.\n"
+msgstr ""
+"VARNING: kan inte %%-expandera anteckning (för stor).  Använder den utan "
+"expansion.\n"
 
-#: ../g10/sign.c:115
+#: g10/sign.c:115
 #, c-format
-msgid "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
-msgstr "VARNING: kunde inte %%-expandera policy-url (för stor).  Använder oexpanderad.\n"
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgstr ""
+"VARNING: kunde inte %%-expandera policy-url (för stor).  Använder "
+"oexpanderad.\n"
 
-#: ../g10/sign.c:138
+#: g10/sign.c:138
 #, c-format
-msgid "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using unexpanded.\n"
-msgstr "VARNING: kunde inte %%-expandera url för föredragen nyckelserver (för stor).  Använder oexpanderad.\n"
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+"VARNING: kunde inte %%-expandera url för föredragen nyckelserver (för "
+"stor).  Använder oexpanderad.\n"
 
-#: ../g10/sign.c:311
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
 
-#: ../g10/sign.c:320
+#: g10/sign.c:320
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signatur från: \"%s\"\n"
 
-#: ../g10/sign.c:760
+#: g10/sign.c:760
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara skapa signaturer i en separat fil med nycklar av PGP 2.x-typ\n"
 "när du är i --pgp2-läge\n"
 
-#: ../g10/sign.c:836
+#: g10/sign.c:836
 #, c-format
-msgid "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot mottagarinställningarna\n"
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot "
+"mottagarinställningarna\n"
 
-#: ../g10/sign.c:963
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "signerar:"
 
-#: ../g10/sign.c:1078
+#: g10/sign.c:1078
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra klartextsignaturer med en PGP 2.x-nyckel\n"
 "när du är i --pgp2-läge\n"
 
-#: ../g10/sign.c:1262
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
 
 # Slumptalsgenerator: Random Number Generator
-#: ../g10/skclist.c:149
-#: ../g10/skclist.c:213
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "nyckeln är inte markerad som osäker - det går inte att använda den med fejkad slumptalsgenerator!\n"
+msgstr ""
+"nyckeln är inte markerad som osäker - det går inte att använda den med "
+"fejkad slumptalsgenerator!\n"
 
-#: ../g10/skclist.c:180
+#: g10/skclist.c:180
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "hoppade över \"%s\": förekommer flera gånger\n"
 
-#: ../g10/skclist.c:188
-#: ../g10/skclist.c:198
-#: ../g10/skclist.c:207
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: ../g10/skclist.c:193
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: ../g10/skclist.c:208
+#: g10/skclist.c:208
 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!"
+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:360
+#: 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"
 
-#: ../g10/tdbdump.c:103
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6338,242 +6045,227 @@ msgstr ""
 "# Skapat lista över tilldelade tillitsvärden %s\n"
 "# (Använd \"gpg --import-ownertrust\" för att återställa dem)\n"
 
-#: ../g10/tdbdump.c:158
-#: ../g10/tdbdump.c:166
-#: ../g10/tdbdump.c:171
-#: ../g10/tdbdump.c:176
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "fel i \"%s\": %s\n"
 
-#: ../g10/tdbdump.c:158
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "raden är för lång"
 
-#: ../g10/tdbdump.c:166
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "kolon saknas"
 
-#: ../g10/tdbdump.c:172
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "ogiltigt fingeravtryck"
 
-#: ../g10/tdbdump.c:177
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "värde för ägartillit saknas"
 
-#. error
-#: ../g10/tdbdump.c:213
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "fel vid sökning av tillitsvärde i \"%s\": %s\n"
 
-#: ../g10/tdbdump.c:217
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "läsfel i \"%s\":  %s\n"
 
-#: ../g10/tdbdump.c:226
-#: ../g10/trustdb.c:375
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 
-#: ../g10/tdbio.c:128
-#: ../g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
-#: ../g10/tdbio.c:135
-#: ../g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
 
-#: ../g10/tdbio.c:245
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "tillitsdatabastransaktion för stor\n"
 
-#: ../g10/tdbio.c:498
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kan inte komma åt \"%s\": %s\n"
 
-#: ../g10/tdbio.c:524
+#: g10/tdbio.c:524
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: ../g10/tdbio.c:534
-#: ../g10/tdbio.c:557
-#: ../g10/tdbio.c:598
-#: ../sm/keydb.c:221
+#: g10/tdbio.c:534 g10/tdbio.c:557 g10/tdbio.c:598 sm/keydb.c:221
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "kan inte skapa lås för \"%s\"\n"
 
 # se förra kommentaren
-#: ../g10/tdbio.c:536
-#: ../g10/tdbio.c:601
+#: g10/tdbio.c:536 g10/tdbio.c:601
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "kan inte låsa \"%s\"\n"
 
-#: ../g10/tdbio.c:562
+#: g10/tdbio.c:562
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: misslyckades med att skapa versionspost: %s"
 
-#: ../g10/tdbio.c:566
+#: g10/tdbio.c:566
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ogiltig tillitsdatabas skapad\n"
 
-#: ../g10/tdbio.c:569
+#: g10/tdbio.c:569
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tillitsdatabas skapad\n"
 
-#: ../g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "OBS: det går inte att skriva till tillitsdatabasen\n"
 
-#: ../g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ogiltig tillitsdatabas\n"
 
-#: ../g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
 
-#: ../g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fel vid uppdatering av versionspost: %s\n"
 
-#: ../g10/tdbio.c:676
-#: ../g10/tdbio.c:696
-#: ../g10/tdbio.c:712
-#: ../g10/tdbio.c:726
-#: ../g10/tdbio.c:756
-#: ../g10/tdbio.c:1380
-#: ../g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fel vid läsning av versionspost: %s\n"
 
-#: ../g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fel vid skrivning av versionspost: %s\n"
 
-#: ../g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "tillitsdatabas: lseek misslyckades: %s\n"
 
-#: ../g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
 
-#: ../g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: detta är inte en tillitsdatabasfil\n"
 
-#: ../g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med postnummer %lu\n"
 
-#: ../g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ogiltig filversion %d\n"
 
-#: ../g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fel vid läsning av ledig post: %s\n"
 
-#: ../g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fel vid läsning av katalogpost: %s\n"
 
-#: ../g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: misslyckades med att nollställa en post: %s\n"
 
-#: ../g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: misslyckades med att lägga till en post: %s\n"
 
-#: ../g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n"
 
-#: ../g10/textfilter.c:147
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "kan inte hantera text med rader längre än %d tecken\n"
 
-#: ../g10/textfilter.c:247
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "indataraden är längre än %d tecken\n"
 
-#: ../g10/trustdb.c:221
+#: 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:252
+#: 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:290
+#: 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:305
+#: 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:315
+#: 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:339
+#: 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:345
+#: 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:441
+#: 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"
+msgstr ""
+"kunde inte använda okänd tillitsmodell (%d) - antar tillitsmodellen %s\n"
 
-#: ../g10/trustdb.c:447
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr "använder tillitsmodellen %s\n"
@@ -6587,125 +6279,128 @@ 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:499
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "15"
 
-#: ../g10/trustdb.c:501
+#: g10/trustdb.c:501
 msgid "[ revoked]"
 msgstr "[   spärrad   ]"
 
-#: ../g10/trustdb.c:503
-#: ../g10/trustdb.c:508
+#: g10/trustdb.c:503 g10/trustdb.c:508
 msgid "[ expired]"
 msgstr "[   utgånget  ]"
 
-#: ../g10/trustdb.c:507
+#: g10/trustdb.c:507
 msgid "[ unknown]"
 msgstr "[    okänt    ]"
 
-#: ../g10/trustdb.c:509
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr "[ odefinierad ]"
 
-#: ../g10/trustdb.c:510
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr "[  marginell  ]"
 
-#: ../g10/trustdb.c:511
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr "[ fullständig ]"
 
-#: ../g10/trustdb.c:512
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr "[förbehållslös]"
 
-#: ../g10/trustdb.c:527
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr "odefinierad"
 
-#: ../g10/trustdb.c:528
+#: g10/trustdb.c:528
 msgid "never"
 msgstr "aldrig"
 
-#: ../g10/trustdb.c:529
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr "marginell"
 
-#: ../g10/trustdb.c:530
+#: g10/trustdb.c:530
 msgid "full"
 msgstr "fullständig"
 
-#: ../g10/trustdb.c:531
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr "förbehållslös"
 
-#: ../g10/trustdb.c:571
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: ../g10/trustdb.c:577
-#: ../g10/trustdb.c:2423
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, 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:586
+#: 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"
+msgstr ""
+"det behövs ingen kontroll av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: ../g10/trustdb.c:601
+#: 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"
+msgstr ""
+"det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: ../g10/trustdb.c:833
-#: ../g10/trustdb.c:1271
+#: 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:1028
+#: 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:1032
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
 # Vad är detta!?
-#: ../g10/trustdb.c:2166
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: ../g10/trustdb.c:2231
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: ../g10/trustdb.c:2245
+#: g10/trustdb.c:2245
 #, 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:2268
+#: g10/trustdb.c:2268
 #, 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:2354
+#: g10/trustdb.c:2354
 #, 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"
+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:2429
+#: g10/trustdb.c:2429
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "kunde inte uppdatera versionspost i tillitsdatabasen: skrivning misslyckades: %s\n"
+msgstr ""
+"kunde inte uppdatera versionspost i tillitsdatabasen: skrivning "
+"misslyckades: %s\n"
 
-#: ../g10/verify.c:118
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6715,158 +6410,154 @@ msgstr ""
 "Kom ihåg att signaturfilen (.sig eller .asc)\n"
 "ska vara den först angivna filen på kommandoraden\n"
 
-#: ../g10/verify.c:205
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "raden %u är för lång, eller saknar nyradstecken\n"
 
-#: ../g10/verify.c:250
+#: g10/verify.c:250
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "kan inte öppna fd %d: %s\n"
 
-#: ../jnlib/argparse.c:176
+#: jnlib/argparse.c:176
 msgid "argument not expected"
 msgstr "argument förväntades inte"
 
-#: ../jnlib/argparse.c:178
+#: jnlib/argparse.c:178
 msgid "read error"
 msgstr "läsfel"
 
-#: ../jnlib/argparse.c:180
+#: jnlib/argparse.c:180
 msgid "keyword too long"
 msgstr "nyckelordet är för långt"
 
-#: ../jnlib/argparse.c:182
+#: jnlib/argparse.c:182
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: ../jnlib/argparse.c:184
+#: jnlib/argparse.c:184
 msgid "invalid command"
 msgstr "ogiltigt kommando"
 
-#: ../jnlib/argparse.c:186
+#: jnlib/argparse.c:186
 msgid "invalid alias definition"
 msgstr "ogiltig aliasdefinition"
 
-#: ../jnlib/argparse.c:188
+#: jnlib/argparse.c:188
 msgid "invalid option"
 msgstr "ogiltig flagga"
 
-#: ../jnlib/argparse.c:196
+#: jnlib/argparse.c:196
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "argument för flaggan \"%.50s\" saknas\n"
 
-#: ../jnlib/argparse.c:198
+#: jnlib/argparse.c:198
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "flaggan \"%.50s\" förväntar sig inte ett argument\n"
 
-#: ../jnlib/argparse.c:201
+#: jnlib/argparse.c:201
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "ogiltigt kommando \"%.50s\"\n"
 
-#: ../jnlib/argparse.c:203
+#: jnlib/argparse.c:203
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "flagga \"%.50s\" är tvetydig\n"
 
-#: ../jnlib/argparse.c:205
+#: jnlib/argparse.c:205
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "kommandot \"%.50s\" är tvetydigt\n"
 
-#: ../jnlib/argparse.c:207
+#: jnlib/argparse.c:207
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "ogiltig flagga \"%.50s\"\n"
 
-#: ../jnlib/logging.c:626
+#: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 
-#: ../jnlib/utf8conv.c:85
+#: jnlib/utf8conv.c:85
 #, c-format
 msgid "error loading `%s': %s\n"
 msgstr "fel vid inläsning av \"%s\": %s\n"
 
-#: ../jnlib/utf8conv.c:123
+#: jnlib/utf8conv.c:123
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "konvertering från \"%s\" till \"%s\" är inte tillgänglig\n"
 
-#: ../jnlib/utf8conv.c:131
+#: jnlib/utf8conv.c:131
 #, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open misslyckades: %s\n"
 
-#: ../jnlib/utf8conv.c:387
-#: ../jnlib/utf8conv.c:653
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
 #, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: ../jnlib/dotlock.c:235
+#: jnlib/dotlock.c:235
 #, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
 
-#: ../jnlib/dotlock.c:270
+#: jnlib/dotlock.c:270
 #, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "fel vid skrivning till \"%s\": %s\n"
 
-#: ../jnlib/dotlock.c:454
+#: jnlib/dotlock.c:454
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "tar bort gammal låsfil (skapad av %d)\n"
 
-#. Under RISCOS we are *pretty* sure that the other task
-#. is dead and therefore we remove the stale lock file.
-#: ../jnlib/dotlock.c:460
+#: jnlib/dotlock.c:460
 msgid " - probably dead - removing lock"
 msgstr " - antagligen död - tar bort lås"
 
-#: ../jnlib/dotlock.c:470
+#: jnlib/dotlock.c:470
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "väntar på lås (hålls av %d%s) %s...\n"
 
-#: ../jnlib/dotlock.c:471
+#: jnlib/dotlock.c:471
 msgid "(deadlock?) "
 msgstr "(dödläge?) "
 
-#: ../jnlib/dotlock.c:494
+#: jnlib/dotlock.c:494
 #, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "låset \"%s\" gjordes inte: %s\n"
 
-#. Wait until lock has been released.
-#: ../jnlib/dotlock.c:502
+#: jnlib/dotlock.c:502
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "väntar på låset %s...\n"
 
-#: ../kbx/kbxutil.c:92
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "ställ in felsökningsflaggor"
 
-#: ../kbx/kbxutil.c:93
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "aktivera fullständigt felsökningsläge"
 
-#: ../kbx/kbxutil.c:114
+#: kbx/kbxutil.c:114
 msgid "Please report bugs to "
 msgstr "Rapportera fel till "
 
-#: ../kbx/kbxutil.c:118
+#: 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:121
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6874,234 +6565,224 @@ msgstr ""
 "Syntax: kbxutil [flaggor] [filer]\n"
 "lista, exportera, importera nyckelskåpsdata\n"
 
-#: ../scd/app-nks.c:326
-#: ../scd/app-openpgp.c:1392
-#: ../scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||Knappa in din PIN-kod på läsarens knappsats"
 
-#: ../scd/app-nks.c:330
-#: ../scd/app-openpgp.c:1396
-#: ../scd/app-openpgp.c:1428
-#: ../scd/app-openpgp.c:1575
-#: ../scd/app-openpgp.c:1593
-#: ../scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-återanrop returnerade fel: %s\n"
 
-#: ../scd/app-nks.c:378
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN har ännu inte ändrats\n"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: ../scd/app-nks.c:555
-#: ../scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN-kod"
 
-#: ../scd/app-nks.c:558
-#: ../scd/app-openpgp.c:1751
-#: ../scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fel vid hämtning av ny PIN-kod: %s\n"
 
-#: ../scd/app-openpgp.c:602
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
 
-#: ../scd/app-openpgp.c:615
+#: scd/app-openpgp.c:615
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "misslyckades med att lagra datum för skapandet: %s\n"
 
-#: ../scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1011
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "läsning av publik nyckel misslyckades: %s\n"
 
-#: ../scd/app-openpgp.c:1019
-#: ../scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr "svaret innehåller inte publikt nyckeldata\n"
 
-#: ../scd/app-openpgp.c:1027
-#: ../scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr "svaret innehåller inte en RSA-modulus\n"
 
-#: ../scd/app-openpgp.c:1036
-#: ../scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
-#: ../scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "använder standard-PIN som %s\n"
 
-#. Verification of CHV2 with the default PIN failed,
-#. although the card pretends to have the default PIN set as
-#. CHV2.  We better disable the def_chv2 flag now.
-#: ../scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
-msgstr "misslyckades med att använda standard-PIN som %s: %s - inaktiverar ytterligare standardanvändning\n"
+msgstr ""
+"misslyckades med att använda standard-PIN som %s: %s - inaktiverar "
+"ytterligare standardanvändning\n"
 
-#: ../scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Ange din PIN-kod på läsarens knappsats%%0A[signaturer gjorda: %lu]"
 
-#: ../scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
 
-#: ../scd/app-openpgp.c:1435
-#: ../scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
 
-#: ../scd/app-openpgp.c:1448
-#: ../scd/app-openpgp.c:1488
-#: ../scd/app-openpgp.c:1612
-#: ../scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "validering av CHV%d misslyckades: %s\n"
 
-#: ../scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
 
-#: ../scd/app-openpgp.c:1532
-#: ../scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr "fel vid hämtning av CHV-status från kort\n"
 
-#: ../scd/app-openpgp.c:1538
-#: ../scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr "kortet är låst permanent!\n"
 
-#: ../scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d försök för Admin PIN-koden återstår innan kortet låses permanent\n"
 
-#: ../scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1555
 #, c-format
-msgid "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: %d]"
-msgstr "|A|Ange administratörens PIN-kod på läsarens knappsats%%0A[återstående försök: %d]"
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+"|A|Ange administratörens PIN-kod på läsarens knappsats%%0A[återstående "
+"försök: %d]"
 
-#: ../scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1570
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "|A|Ange administratörens PIN-kod på läsarens knappsats"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: ../scd/app-openpgp.c:1590
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN-kod"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: ../scd/app-openpgp.c:1747
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN-kod"
 
-#: ../scd/app-openpgp.c:1801
-#: ../scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 msgid "error reading application data\n"
 msgstr "fel vid läsning av programdata\n"
 
-#: ../scd/app-openpgp.c:1807
-#: ../scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 msgid "error reading fingerprint DO\n"
 msgstr "fel vid läsning av fingeravtryckets DO\n"
 
-#: ../scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:1817
 msgid "key already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: ../scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr "befintlig nyckel kommer att ersättas\n"
 
-#: ../scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:1823
 msgid "generating new key\n"
 msgstr "genererar ny nyckel\n"
 
-#: ../scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr "tidsstämpel för skapandet saknas\n"
 
-#: ../scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modulus saknas eller är inte %d bitar stor\n"
 
-#: ../scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "Publik RSA-exponent saknas eller större än %d bitar\n"
 
-#: ../scd/app-openpgp.c:2012
-#: ../scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtal %s saknas eller inte %d bitar stor\n"
 
-#: ../scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2082
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "misslyckades med att lagra nyckeln: %s\n"
 
-#: ../scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr "var god vänta under tiden nyckeln genereras ...\n"
 
-#: ../scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2156
 msgid "generating key failed\n"
 msgstr "nyckelgenereringen misslyckades\n"
 
-#: ../scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2159
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "nyckelgenereringen är färdig (%d sekunder)\n"
 
-#: ../scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
 
-#: ../scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr "avtrycket på kortet stämmer inte med den begärda\n"
 
-#: ../scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
 
-#: ../scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer skapade hittills: %lu\n"
 
-#: ../scd/app-openpgp.c:2701
-msgid "verification of Admin PIN is currently prohibited through this command\n"
-msgstr "validering av Admin PIN-kod är för närvarande förbjudet genom detta kommando\n"
+#: scd/app-openpgp.c:2701
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+"validering av Admin PIN-kod är för närvarande förbjudet genom detta "
+"kommando\n"
 
-#: ../scd/app-openpgp.c:2777
-#: ../scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@ -7109,49 +6790,47 @@ msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: ../scd/app-dinsig.c:526
+#: scd/app-dinsig.c:526
 msgid "|N|Initial New PIN"
 msgstr "|N|Initial PIN-kod"
 
-#: ../scd/scdaemon.c:105
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr "kör i multiserverläge (förgrund)"
 
-#: ../scd/scdaemon.c:111
-#: ../sm/gpgsm.c:366
+#: scd/scdaemon.c:111 sm/gpgsm.c:366
 msgid "read options from file"
 msgstr "läs inställningar från fil"
 
-#: ../scd/scdaemon.c:121
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr "|N|anslut till läsare på port N"
 
-#: ../scd/scdaemon.c:122
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMN|använd NAMN som ct-API-drivrutin"
 
-#: ../scd/scdaemon.c:123
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMN|använd NAMN som PC/SC-drivrutin"
 
-#: ../scd/scdaemon.c:126
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr "använd inte den interna CCID-drivrutinen"
 
-#. end --disable-ccid
-#: ../scd/scdaemon.c:131
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr "använd inte läsarens knappsats"
 
-#: ../scd/scdaemon.c:132
+#: scd/scdaemon.c:132
 msgid "allow the use of admin card commands"
 msgstr "tillåt användning av administratörskommandon för kort"
 
-#: ../scd/scdaemon.c:210
+#: scd/scdaemon.c:210
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Användning: scdaemon [flaggor] (-h för hjälp)"
 
-#: ../scd/scdaemon.c:212
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -7159,492 +6838,465 @@ msgstr ""
 "Syntax: scdaemon [flaggor] [kommando [argument]]\n"
 "Smartkortsdemon för GnuPG\n"
 
-#: ../scd/scdaemon.c:670
+#: scd/scdaemon.c:670
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "använd flaggan \"--daemon\" för att köra programmet i bakgrunden\n"
 
-#: ../scd/scdaemon.c:1024
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "hanterare för fd %d startad\n"
 
-#: ../scd/scdaemon.c:1030
+#: scd/scdaemon.c:1030
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "hanterare för fd %d avslutad\n"
 
 # överhoppad eller hoppades över?
-#: ../sm/base64.c:325
+#: sm/base64.c:325
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ogiltigt radix64-tecken %02x hoppades över\n"
 
-#: ../sm/call-agent.c:138
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "misslyckades med att förmedla %s-begäran till klient\n"
 
-#: ../sm/call-dirmngr.c:233
+#: sm/call-dirmngr.c:233
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "ingen körande dirmngr - startar \"%s\"\n"
 
-#: ../sm/call-dirmngr.c:266
+#: sm/call-dirmngr.c:266
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "miljövariabeln DIRMNGR_INFO är felformaterad\n"
 
-#: ../sm/call-dirmngr.c:278
+#: sm/call-dirmngr.c:278
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "dirmngr-protokoll version %d stöds inte\n"
 
-#: ../sm/call-dirmngr.c:298
+#: sm/call-dirmngr.c:298
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
 
-#: ../sm/certchain.c:196
+#: sm/certchain.c:196
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "valideringsmodellen begärd av certifikat: %s"
 
-#: ../sm/certchain.c:197
-#: ../sm/certchain.c:1805
+#: sm/certchain.c:197 sm/certchain.c:1805
 msgid "chain"
 msgstr "kedja"
 
-#: ../sm/certchain.c:198
-#: ../sm/certchain.c:1805
+#: sm/certchain.c:198 sm/certchain.c:1805
 msgid "shell"
 msgstr "skal"
 
-#: ../sm/certchain.c:243
+#: sm/certchain.c:243
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "kritiska certifikattillägget %s stöds inte"
 
-#: ../sm/certchain.c:282
+#: sm/certchain.c:282
 msgid "issuer certificate is not marked as a CA"
 msgstr "utfärdarens certifikat är inte markerat som en CA"
 
-#: ../sm/certchain.c:320
+#: sm/certchain.c:320
 msgid "critical marked policy without configured policies"
 msgstr "kritisk markerad policy utan konfigurerade policier"
 
-#: ../sm/certchain.c:330
+#: sm/certchain.c:330
 #, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "misslyckades med att öppna \"%s\": %s\n"
 
-#: ../sm/certchain.c:338
-#: ../sm/certchain.c:367
+#: sm/certchain.c:338 sm/certchain.c:367
 msgid "note: non-critical certificate policy not allowed"
 msgstr "observera: icke-kritisk certifikatpolicy tillåts inte"
 
-#: ../sm/certchain.c:342
-#: ../sm/certchain.c:371
+#: sm/certchain.c:342 sm/certchain.c:371
 msgid "certificate policy not allowed"
 msgstr "certifikatpolicy tillåts inte"
 
-#: ../sm/certchain.c:483
+#: sm/certchain.c:483
 msgid "looking up issuer at external location\n"
 msgstr "slår upp utfärdare på extern plats\n"
 
-#: ../sm/certchain.c:502
+#: sm/certchain.c:502
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antal utfärdare som matchar: %d\n"
 
-#: ../sm/certchain.c:544
+#: sm/certchain.c:544
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "slår upp utfärdare från Dirmngr-cachen\n"
 
-#: ../sm/certchain.c:568
+#: sm/certchain.c:568
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "antal matchande certifikat: %d\n"
 
-#: ../sm/certchain.c:570
+#: sm/certchain.c:570
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "uppslag av endast-mellanlagrad dirmngr-nyckel misslyckades: %s\n"
 
-#: ../sm/certchain.c:742
-#: ../sm/certchain.c:1229
-#: ../sm/certchain.c:1833
-#: ../sm/decrypt.c:259
-#: ../sm/encrypt.c:347
-#: ../sm/sign.c:327
-#: ../sm/verify.c:113
+#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
-#: ../sm/certchain.c:902
+#: sm/certchain.c:902
 msgid "certificate has been revoked"
 msgstr "certifikatet har spärrats"
 
-#: ../sm/certchain.c:912
+#: sm/certchain.c:912
 msgid "no CRL found for certificate"
 msgstr "ingen spärrlista hittades för certifikatet"
 
-#: ../sm/certchain.c:917
+#: sm/certchain.c:917
 msgid "the status of the certificate is unknown"
 msgstr "status för certifikatet är okänt"
 
-#: ../sm/certchain.c:922
+#: sm/certchain.c:922
 msgid "the available CRL is too old"
 msgstr "den tillgängliga spärrlistan är för gammal"
 
-#: ../sm/certchain.c:924
+#: sm/certchain.c:924
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "se till att \"dirmngr\" är korrekt installerat\n"
 
-#: ../sm/certchain.c:930
+#: sm/certchain.c:930
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontroll mot spärrlistan misslyckades: %s"
 
-#: ../sm/certchain.c:959
-#: ../sm/certchain.c:1027
+#: sm/certchain.c:959 sm/certchain.c:1027
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikat med felaktig giltighetstid: %s"
 
-#: ../sm/certchain.c:974
-#: ../sm/certchain.c:1059
+#: sm/certchain.c:974 sm/certchain.c:1059
 msgid "certificate not yet valid"
 msgstr "certifikatet är ännu inte giltigt"
 
-#: ../sm/certchain.c:975
-#: ../sm/certchain.c:1060
+#: sm/certchain.c:975 sm/certchain.c:1060
 msgid "root certificate not yet valid"
 msgstr "rotcertifikatet är ännu inte giltigt"
 
-#. other
-#: ../sm/certchain.c:976
-#: ../sm/certchain.c:1061
+#: sm/certchain.c:976 sm/certchain.c:1061
 msgid "intermediate certificate not yet valid"
 msgstr "tillfälligt certifikat är ännu inte giltigt"
 
-#: ../sm/certchain.c:989
+#: sm/certchain.c:989
 msgid "certificate has expired"
 msgstr "certifikatet har gått ut"
 
-#: ../sm/certchain.c:990
+#: sm/certchain.c:990
 msgid "root certificate has expired"
 msgstr "rotcertifikatet har gått ut"
 
-#. other
-#: ../sm/certchain.c:991
+#: sm/certchain.c:991
 msgid "intermediate certificate has expired"
 msgstr "tillfälligt certifikat har gått ut"
 
-#: ../sm/certchain.c:1033
+#: sm/certchain.c:1033
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "nödvändiga certifikattillägg saknas: %s%s%s"
 
-#: ../sm/certchain.c:1042
+#: sm/certchain.c:1042
 msgid "certificate with invalid validity"
 msgstr "certifikat med felaktig giltighetstid"
 
-#: ../sm/certchain.c:1079
+#: sm/certchain.c:1079
 msgid "signature not created during lifetime of certificate"
 msgstr "signaturen inte skapad under certifikatets livstid"
 
-#: ../sm/certchain.c:1081
+#: sm/certchain.c:1081
 msgid "certificate not created during lifetime of issuer"
 msgstr "certifikatet skapades inte under utfärdarens livstid"
 
-#: ../sm/certchain.c:1082
+#: sm/certchain.c:1082
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "tillfälligt certifikat är inte skapat under utfärdarens livstid"
 
-#: ../sm/certchain.c:1086
+#: sm/certchain.c:1086
 msgid "  (  signature created at "
 msgstr "  (  signatur skapad "
 
-#.
-#: ../sm/certchain.c:1087
+#: sm/certchain.c:1087
 msgid "  (certificate created at "
 msgstr "  (certifikat skapat "
 
-#: ../sm/certchain.c:1090
+#: sm/certchain.c:1090
 msgid "  (certificate valid from "
 msgstr "  (certifikat giltigt från "
 
-#.
-#: ../sm/certchain.c:1091
+#: sm/certchain.c:1091
 msgid "  (     issuer valid from "
 msgstr "  (     utfärdare giltig från "
 
-#: ../sm/certchain.c:1121
+#: sm/certchain.c:1121
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeravtryck=%s\n"
 
-#: ../sm/certchain.c:1130
+#: sm/certchain.c:1130
 msgid "root certificate has now been marked as trusted\n"
 msgstr "rotcertifikatet har nu markerats som betrott\n"
 
-#: ../sm/certchain.c:1143
+#: sm/certchain.c:1143
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "interaktiv markering som betrodd inte aktiverad i gpg-agent\n"
 
-#: ../sm/certchain.c:1149
+#: sm/certchain.c:1149
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interaktiv markering som betrodd inaktiverad för den här sessionen\n"
 
-#: ../sm/certchain.c:1206
+#: sm/certchain.c:1206
 msgid "WARNING: creation time of signature not known - assuming current time"
-msgstr "VARNING: tid för skapandet av signaturen är inte känd - antar aktuell tid"
+msgstr ""
+"VARNING: tid för skapandet av signaturen är inte känd - antar aktuell tid"
 
-#: ../sm/certchain.c:1270
+#: sm/certchain.c:1270
 msgid "no issuer found in certificate"
 msgstr "ingen utfärdare hittades i certifikatet"
 
-#: ../sm/certchain.c:1343
+#: sm/certchain.c:1343
 msgid "self-signed certificate has a BAD signature"
 msgstr "självsignerat certifikat har en FELAKTIG signatur"
 
-#: ../sm/certchain.c:1412
+#: sm/certchain.c:1412
 msgid "root certificate is not marked trusted"
 msgstr "rotcertifikatet har inte markerats som betrott"
 
-#: ../sm/certchain.c:1425
+#: sm/certchain.c:1425
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: ../sm/certchain.c:1454
-#: ../sm/import.c:158
+#: sm/certchain.c:1454 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr "certifikatkedjan är för lång\n"
 
-#: ../sm/certchain.c:1466
+#: sm/certchain.c:1466
 msgid "issuer certificate not found"
 msgstr "utfärdarens certifikat hittades inte"
 
-#: ../sm/certchain.c:1499
+#: sm/certchain.c:1499
 msgid "certificate has a BAD signature"
 msgstr "certifikatet har en FELAKTIG signatur"
 
-#: ../sm/certchain.c:1530
+#: sm/certchain.c:1530
 msgid "found another possible matching CA certificate - trying again"
 msgstr "hittade ett annat möjligen matchande CA-certifikat - försöker igen"
 
-#: ../sm/certchain.c:1581
+#: sm/certchain.c:1581
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "certifikatkedjan längre än vad som tillåts av CA (%d)"
 
-#: ../sm/certchain.c:1621
-#: ../sm/certchain.c:1904
+#: sm/certchain.c:1621 sm/certchain.c:1904
 msgid "certificate is good\n"
 msgstr "certifikatet är korrekt\n"
 
-#: ../sm/certchain.c:1622
+#: sm/certchain.c:1622
 msgid "intermediate certificate is good\n"
 msgstr "tillfälligt certifikat är korrekt\n"
 
-#. other
-#: ../sm/certchain.c:1623
+#: sm/certchain.c:1623
 msgid "root certificate is good\n"
 msgstr "rotcertifikatet är korrekt\n"
 
-#: ../sm/certchain.c:1794
+#: sm/certchain.c:1794
 msgid "switching to chain model"
 msgstr "växlar till kedjemodell"
 
-#: ../sm/certchain.c:1803
+#: sm/certchain.c:1803
 #, c-format
 msgid "validation model used: %s"
 msgstr "valideringsmodell använd: %s"
 
-#: ../sm/certcheck.c:101
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s-nyckeln använder en osäker hash (%u bitar)\n"
 
-#: ../sm/certcheck.c:111
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "en %u-bitars hash är inte giltig för en %u-bitars %s-nyckel\n"
 
-#: ../sm/certcheck.c:248
-#: ../sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(det här är MD2-algoritmen)\n"
 
-#: ../sm/certdump.c:68
-#: ../sm/certdump.c:151
+#: sm/certdump.c:68 sm/certdump.c:151
 msgid "none"
 msgstr "ingen"
 
-#: ../sm/certdump.c:162
+#: sm/certdump.c:162
 msgid "[none]"
 msgstr "[ingen]"
 
-#: ../sm/certdump.c:585
-#: ../sm/certdump.c:630
-#: ../sm/certdump.c:695
-#: ../sm/certdump.c:748
+#: sm/certdump.c:585 sm/certdump.c:630 sm/certdump.c:695 sm/certdump.c:748
 msgid "[Error - invalid encoding]"
 msgstr "[Fel - ogiltig kodning]"
 
-#: ../sm/certdump.c:593
-#: ../sm/certdump.c:638
+#: sm/certdump.c:593 sm/certdump.c:638
 msgid "[Error - out of core]"
 msgstr "[Fel - slut på kärna]"
 
-#: ../sm/certdump.c:675
-#: ../sm/certdump.c:731
+#: sm/certdump.c:675 sm/certdump.c:731
 msgid "[Error - No name]"
 msgstr "[Fel - Inget namn]"
 
-#: ../sm/certdump.c:700
-#: ../sm/certdump.c:754
+#: sm/certdump.c:700 sm/certdump.c:754
 msgid "[Error - invalid DN]"
 msgstr "[Fel - ogiltigt DN]"
 
-#: ../sm/certdump.c:955
+#: sm/certdump.c:955
 #, c-format
 msgid ""
-"Please enter the passphrase to unlock the secret key for the X.509 certificate:\n"
+"Please enter the passphrase to unlock the secret key for the X.509 "
+"certificate:\n"
 "\"%s\"\n"
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 msgstr ""
-"Ange lösenfrasen för att låsa upp den hemliga nyckeln för X.509-certifikatet:\n"
+"Ange lösenfrasen för att låsa upp den hemliga nyckeln för X.509-"
+"certifikatet:\n"
 "\"%s\"\n"
 "S/N %s, ID 0x%08lX,\n"
 "skapad %s, går ut %s.\n"
 
-#: ../sm/certlist.c:122
+#: sm/certlist.c:122
 msgid "no key usage specified - assuming all usages\n"
 msgstr "ingen nyckelanvändning angiven - antar alla användningsområden\n"
 
-#: ../sm/certlist.c:132
-#: ../sm/keylist.c:269
+#: sm/certlist.c:132 sm/keylist.c:269
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "fel vid hämtning av nyckelanvändningsinformation: %s\n"
 
-#: ../sm/certlist.c:142
+#: sm/certlist.c:142
 msgid "certificate should have not been used for certification\n"
 msgstr "certifikatet skulle inte använts för certifiering\n"
 
-#: ../sm/certlist.c:154
+#: sm/certlist.c:154
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr "certifikatet skulle inte använts för signering av OCSP-svar\n"
 
-#: ../sm/certlist.c:165
+#: sm/certlist.c:165
 msgid "certificate should have not been used for encryption\n"
 msgstr "certifikatet skulle inte använts för kryptering\n"
 
-#: ../sm/certlist.c:166
+#: sm/certlist.c:166
 msgid "certificate should have not been used for signing\n"
 msgstr "certifikatet skulle inte använts för signering\n"
 
-#: ../sm/certlist.c:167
+#: sm/certlist.c:167
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikatet är inte användbart för kryptering\n"
 
-#: ../sm/certlist.c:168
+#: sm/certlist.c:168
 msgid "certificate is not usable for signing\n"
 msgstr "certifikatet är inte användbart för signering\n"
 
-#: ../sm/certreqgen.c:474
+#: sm/certreqgen.c:474
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "rad %d: ogiltig algoritm\n"
 
-#: ../sm/certreqgen.c:487
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "rad %d: ogiltig nyckellängd %u (giltiga är %d till %d)\n"
 
-#: ../sm/certreqgen.c:505
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "rad %d: inget ämnesnamn angivit\n"
 
-#: ../sm/certreqgen.c:514
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr "rad %d: ogiltig ämnesnamnsetikett \"%.*s\"\n"
 
-#: ../sm/certreqgen.c:517
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr "rad %d: ogiltigt ämnesnamn \"%s\" på position %d\n"
 
-#: ../sm/certreqgen.c:534
+#: sm/certreqgen.c:534
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "rad %d: inte en giltig e-postadress\n"
 
-#: ../sm/certreqgen.c:546
+#: sm/certreqgen.c:546
 #, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "rad %d: fel vid läsning av nyckeln \"%s\" från kortet: %s\n"
 
 # keygrip (i.e. a hash over the public key
 # parameters) formatted as a hex string.
-#: ../sm/certreqgen.c:558
+#: sm/certreqgen.c:558
 #, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "rad %d: fel vid hämtning av nyckelhashen \"%s\": %s\n"
 
-#: ../sm/certreqgen.c:574
+#: sm/certreqgen.c:574
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "rad %d: nyckelgenerering misslyckades: %s <%s>\n"
 
-#: ../sm/certreqgen-ui.c:122
+#: sm/certreqgen-ui.c:122
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: ../sm/certreqgen-ui.c:123
+#: sm/certreqgen-ui.c:123
 #, c-format
 msgid "   (%d) Existing key\n"
 msgstr "   (%d) Befintlig nyckel\n"
 
-#: ../sm/certreqgen-ui.c:124
+#: sm/certreqgen-ui.c:124
 #, c-format
 msgid "   (%d) Existing key from card\n"
 msgstr "   (%d) Befintlig nyckel från kort\n"
 
-#. Ask for the key usage.
-#: ../sm/certreqgen-ui.c:176
+#: sm/certreqgen-ui.c:176
 #, c-format
 msgid "Possible actions for a %s key:\n"
 msgstr "Möjliga åtgärder för en %s-nyckel:\n"
 
-#: ../sm/certreqgen-ui.c:177
+#: sm/certreqgen-ui.c:177
 #, c-format
 msgid "   (%d) sign, encrypt\n"
 msgstr "   (%d) signering, kryptering\n"
 
-#: ../sm/certreqgen-ui.c:178
+#: sm/certreqgen-ui.c:178
 #, c-format
 msgid "   (%d) sign\n"
 msgstr "   (%d) signering\n"
 
-#: ../sm/certreqgen-ui.c:179
+#: sm/certreqgen-ui.c:179
 #, c-format
 msgid "   (%d) encrypt\n"
 msgstr "   (%d) kryptering\n"
 
-#: ../sm/certreqgen-ui.c:203
+#: sm/certreqgen-ui.c:203
 msgid "Enter the X.509 subject name: "
 msgstr "Ange ämnesnamn för X.509: "
 
-#: ../sm/certreqgen-ui.c:207
+#: sm/certreqgen-ui.c:207
 msgid "No subject name given\n"
 msgstr "Inget ämnesnamn angivet\n"
 
-#: ../sm/certreqgen-ui.c:211
+#: sm/certreqgen-ui.c:211
 #, c-format
 msgid "Invalid subject name label `%.*s'\n"
 msgstr "Ogiltig ämnesnamnsetikett \"%.*s\"\n"
@@ -7654,274 +7306,263 @@ msgstr "Ogiltig ämnesnamnsetikett \"%.*s\"\n"
 #. adjust it do the length of your translation.  The
 #. second string is merely passed to atoi so you can
 #. drop everything after the number.
-#: ../sm/certreqgen-ui.c:220
+#: sm/certreqgen-ui.c:220
 #, c-format
 msgid "Invalid subject name `%s'\n"
 msgstr "Ogiltigt ämnesnamn \"%s\"\n"
 
-#: ../sm/certreqgen-ui.c:222
+#: sm/certreqgen-ui.c:222
 msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
 msgstr "20"
 
-#. Get the email addresses.
-#: ../sm/certreqgen-ui.c:234
+#: sm/certreqgen-ui.c:234
 msgid "Enter email addresses"
 msgstr "Ange e-postadresser"
 
-#: ../sm/certreqgen-ui.c:235
+#: sm/certreqgen-ui.c:235
 msgid " (end with an empty line):\n"
 msgstr " (avsluta med en tom rad):\n"
 
-#. DNS names.
-#: ../sm/certreqgen-ui.c:239
+#: sm/certreqgen-ui.c:239
 msgid "Enter DNS names"
 msgstr "Ange DNS-namn"
 
-#: ../sm/certreqgen-ui.c:240
-#: ../sm/certreqgen-ui.c:245
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
 msgid " (optional; end with an empty line):\n"
 msgstr " (valfritt: avsluta med en tom rad:\n"
 
-#. URIs.
-#: ../sm/certreqgen-ui.c:244
+#: sm/certreqgen-ui.c:244
 msgid "Enter URIs"
 msgstr "Ange URI:er"
 
-#: ../sm/certreqgen-ui.c:271
+#: sm/certreqgen-ui.c:271
 msgid "Parameters to be used for the certificate request:\n"
 msgstr "Parametrar som ska användas för denna certifikatbegäran:\n"
 
-#: ../sm/certreqgen-ui.c:289
+#: sm/certreqgen-ui.c:289
 msgid "Now creating certificate request.  This may take a while ...\n"
 msgstr "Skapar nu en certifikatbegäran.  Det kan ta en stund ...\n"
 
-#: ../sm/certreqgen-ui.c:298
+#: sm/certreqgen-ui.c:298
 msgid "Ready.  You should now send this request to your CA.\n"
-msgstr "Färdig.  Du bör nu skicka denna begäran till din certifikatutfärdare.\n"
+msgstr ""
+"Färdig.  Du bör nu skicka denna begäran till din certifikatutfärdare.\n"
 
-#: ../sm/certreqgen-ui.c:303
+#: sm/certreqgen-ui.c:303
 msgid "resource problem: out or core\n"
 msgstr "resursproblem: out or core\n"
 
-#: ../sm/decrypt.c:324
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(det här är RC2-algoritmen)\n"
 
-#: ../sm/decrypt.c:326
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(det här verkar inte vara ett krypterat meddelande)\n"
 
-#: ../sm/delete.c:50
-#: ../sm/delete.c:101
+#: sm/delete.c:50 sm/delete.c:101
 #, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "certifikatet \"%s\" hittades inte: %s\n"
 
-#: ../sm/delete.c:111
-#: ../sm/keydb.c:1395
-#: ../sm/keydb.c:1495
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "fel vid låsning av nyckelskåp: %s\n"
 
-#: ../sm/delete.c:132
+#: sm/delete.c:132
 #, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "dubblett av certifikatet \"%s\" borttaget\n"
 
-#: ../sm/delete.c:134
+#: sm/delete.c:134
 #, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "certifikatet \"%s\" togs bort\n"
 
-#: ../sm/delete.c:164
+#: sm/delete.c:164
 #, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
 
-#: ../sm/encrypt.c:333
+#: sm/encrypt.c:333
 msgid "no valid recipients given\n"
 msgstr "inga giltiga mottagare angavs\n"
 
-#: ../sm/gpgsm.c:248
+#: sm/gpgsm.c:248
 msgid "|[FILE]|make a signature"
 msgstr "|[FIL]|skapa en signatur"
 
-#: ../sm/gpgsm.c:249
+#: sm/gpgsm.c:249
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[FIL]|skapa en klartext-signatur"
 
-#: ../sm/gpgsm.c:257
+#: sm/gpgsm.c:257
 msgid "list external keys"
 msgstr "lista externa nycklar"
 
-#: ../sm/gpgsm.c:259
+#: sm/gpgsm.c:259
 msgid "list certificate chain"
 msgstr "lista certifikatkedja"
 
-#: ../sm/gpgsm.c:262
+#: sm/gpgsm.c:262
 msgid "remove key from the public keyring"
 msgstr "ta bort nyckel från den publika nyckelringen"
 
-#: ../sm/gpgsm.c:265
+#: sm/gpgsm.c:265
 msgid "import certificates"
 msgstr "importera certifikat"
 
-#: ../sm/gpgsm.c:266
+#: sm/gpgsm.c:266
 msgid "export certificates"
 msgstr "exportera certifikat"
 
-#: ../sm/gpgsm.c:267
+#: sm/gpgsm.c:267
 msgid "register a smartcard"
 msgstr "registrera ett smartkort"
 
-#: ../sm/gpgsm.c:269
+#: sm/gpgsm.c:269
 msgid "pass a command to the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: ../sm/gpgsm.c:271
+#: sm/gpgsm.c:271
 msgid "invoke gpg-protect-tool"
 msgstr "starta gpg-protect-tool"
 
-#: ../sm/gpgsm.c:272
+#: sm/gpgsm.c:272
 msgid "change a passphrase"
 msgstr "ändra en lösenfras"
 
-#: ../sm/gpgsm.c:287
+#: sm/gpgsm.c:287
 msgid "create base-64 encoded output"
 msgstr "skapa base-64-kodat utdata"
 
-#: ../sm/gpgsm.c:291
+#: sm/gpgsm.c:291
 msgid "assume input is in PEM format"
 msgstr "anta att inmatning är i PEM-format"
 
-#: ../sm/gpgsm.c:293
+#: sm/gpgsm.c:293
 msgid "assume input is in base-64 format"
 msgstr "anta att inmatning är i base-64-format"
 
-#: ../sm/gpgsm.c:295
+#: sm/gpgsm.c:295
 msgid "assume input is in binary format"
 msgstr "anta att inmatning är i binärformat"
 
-#: ../sm/gpgsm.c:300
+#: sm/gpgsm.c:300
 msgid "use system's dirmngr if available"
 msgstr "använd systemets dirmngr om tillgängligt"
 
-#: ../sm/gpgsm.c:301
+#: sm/gpgsm.c:301
 msgid "never consult a CRL"
 msgstr "kontrollera aldrig mot spärrlista"
 
-#: ../sm/gpgsm.c:308
+#: sm/gpgsm.c:308
 msgid "check validity using OCSP"
 msgstr "kontrollera giltigheten med OCSP"
 
-#: ../sm/gpgsm.c:313
+#: sm/gpgsm.c:313
 msgid "|N|number of certificates to include"
 msgstr "|N|antal certifikat att inkludera"
 
-#: ../sm/gpgsm.c:316
+#: sm/gpgsm.c:316
 msgid "|FILE|take policy information from FILE"
 msgstr "|FIL|hämta policyinformation från FIL"
 
-#: ../sm/gpgsm.c:319
+#: sm/gpgsm.c:319
 msgid "do not check certificate policies"
 msgstr "kontrollera inte certifikatpolicier"
 
-#: ../sm/gpgsm.c:323
+#: sm/gpgsm.c:323
 msgid "fetch missing issuer certificates"
 msgstr "hämta saknade utfärdarcertifikat"
 
-#: ../sm/gpgsm.c:327
+#: sm/gpgsm.c:327
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|använd NAMN som standardmottagare"
 
-#: ../sm/gpgsm.c:329
+#: sm/gpgsm.c:329
 msgid "use the default key as default recipient"
 msgstr "använd standardnyckeln som standardmottagare"
 
-#: ../sm/gpgsm.c:346
+#: sm/gpgsm.c:346
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
-#: ../sm/gpgsm.c:347
+#: sm/gpgsm.c:347
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FIL|skriv en serverlägeslogg till FIL"
 
-#: ../sm/gpgsm.c:349
+#: sm/gpgsm.c:349
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIL|skriv en granskningslogg till FIL"
 
-#: ../sm/gpgsm.c:351
+#: sm/gpgsm.c:351
 msgid "force v3 signatures"
 msgstr "tvinga v3-signaturer"
 
-#: ../sm/gpgsm.c:352
+#: sm/gpgsm.c:352
 msgid "always use a MDC for encryption"
 msgstr "använd alltid en MDC för kryptering"
 
-#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#. { oUseAgent, "use-agent",0, N_("use the gpg-agent")},
-#: ../sm/gpgsm.c:357
+#: sm/gpgsm.c:357
 msgid "batch mode: never ask"
 msgstr "satsläge: fråga aldrig"
 
-#: ../sm/gpgsm.c:358
+#: sm/gpgsm.c:358
 msgid "assume yes on most questions"
 msgstr "anta ja på de flesta frågorna"
 
-#: ../sm/gpgsm.c:359
+#: sm/gpgsm.c:359
 msgid "assume no on most questions"
 msgstr "anta nej på de flesta frågorna"
 
-#: ../sm/gpgsm.c:361
+#: sm/gpgsm.c:361
 msgid "add this keyring to the list of keyrings"
 msgstr "lägg till denna nyckelring till listan över nyckelringar"
 
-#: ../sm/gpgsm.c:362
+#: sm/gpgsm.c:362
 msgid "add this secret keyring to the list"
 msgstr "lägg till denna hemliga nyckelring till listan"
 
-#: ../sm/gpgsm.c:363
-#: ../tools/gpgconf-comp.c:658
-#: ../tools/gpgconf-comp.c:726
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: ../sm/gpgsm.c:364
-#: ../tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|använd denna nyckelserver för att slå upp nycklar"
 
-#: ../sm/gpgsm.c:365
+#: sm/gpgsm.c:365
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|ställ in terminalteckentabell till NAMN"
 
-#: ../sm/gpgsm.c:369
+#: sm/gpgsm.c:369
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
 
-#: ../sm/gpgsm.c:384
+#: sm/gpgsm.c:384
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|läs in tilläggsmodulen FIL"
 
-#: ../sm/gpgsm.c:390
+#: sm/gpgsm.c:390
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: ../sm/gpgsm.c:392
+#: sm/gpgsm.c:392
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd sammandragsalgoritmen NAMN"
 
-#: ../sm/gpgsm.c:395
+#: sm/gpgsm.c:395
 msgid "|N|use compress algorithm N"
 msgstr "|N|använd komprimeringsalgoritmen N"
 
-#: ../sm/gpgsm.c:577
+#: sm/gpgsm.c:577
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Användning: gpgsm [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: ../sm/gpgsm.c:580
+#: sm/gpgsm.c:580
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7931,181 +7572,181 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: ../sm/gpgsm.c:707
+#: sm/gpgsm.c:707
 msgid "usage: gpgsm [options] "
 msgstr "användning: gpgsm [flaggor] "
 
-#: ../sm/gpgsm.c:805
+#: sm/gpgsm.c:805
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "OBSERVERA: kommer inte att kunna kryptera till \"%s\": %s\n"
 
-#: ../sm/gpgsm.c:816
+#: sm/gpgsm.c:816
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "okänd valideringsmodell \"%s\"\n"
 
-#: ../sm/gpgsm.c:867
+#: sm/gpgsm.c:867
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: inget värdnamn angivet\n"
 
-#: ../sm/gpgsm.c:886
+#: sm/gpgsm.c:886
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: lösenord angivet utan användare\n"
 
-#: ../sm/gpgsm.c:907
+#: sm/gpgsm.c:907
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: hoppar över denna rad\n"
 
-#: ../sm/gpgsm.c:1419
+#: sm/gpgsm.c:1419
 msgid "could not parse keyserver\n"
 msgstr "kunde inte tolka nyckelserver\n"
 
-#: ../sm/gpgsm.c:1502
+#: sm/gpgsm.c:1502
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: ../sm/gpgsm.c:1604
+#: sm/gpgsm.c:1604
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: ../sm/gpgsm.c:1642
+#: sm/gpgsm.c:1642
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan inte signera med \"%s\": %s\n"
 
-#: ../sm/gpgsm.c:1813
+#: sm/gpgsm.c:1813
 msgid "this command has not yet been implemented\n"
 msgstr "det här kommandot har ännu inte implementerats\n"
 
-#: ../sm/gpgsm.c:1968
+#: sm/gpgsm.c:1968
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
 
-#: ../sm/import.c:109
+#: sm/import.c:109
 #, c-format
 msgid "total number processed: %lu\n"
 msgstr "totalt antal behandlade: %lu\n"
 
-#: ../sm/import.c:227
+#: sm/import.c:227
 msgid "error storing certificate\n"
 msgstr "fel vid lagring av certifikat\n"
 
-#: ../sm/import.c:235
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr "enkla certifikatkontroller misslyckades - importeras inte\n"
 
-#: ../sm/import.c:421
-#: ../sm/import.c:453
+#: 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:542
-#: ../tools/gpg-connect-agent.c:1318
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fel vid läsning av indata: %s\n"
 
-#: ../sm/keydb.c:188
+#: sm/keydb.c:188
 #, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "fel när nyckelskåpet \"%s\" skapades: %s\n"
 
-#: ../sm/keydb.c:191
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr "du kanske vill starta gpg-agent först\n"
 
-#: ../sm/keydb.c:196
+#: sm/keydb.c:196
 #, c-format
 msgid "keybox `%s' created\n"
 msgstr "nyckelskåpet \"%s\" skapat\n"
 
-#: ../sm/keydb.c:1310
-#: ../sm/keydb.c:1378
+#: sm/keydb.c:1310 sm/keydb.c:1378
 msgid "failed to get the fingerprint\n"
 msgstr "misslyckades med att få fingeravtrycket\n"
 
-#: ../sm/keydb.c:1317
-#: ../sm/keydb.c:1385
+#: sm/keydb.c:1317 sm/keydb.c:1385
 msgid "failed to allocate keyDB handle\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
-#: ../sm/keydb.c:1338
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem vid sökandet efter befintligt certifikat: %s\n"
 
-#: ../sm/keydb.c:1346
+#: sm/keydb.c:1346
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "fel vid sökning efter skrivbar keyDB: %s\n"
 
-#: ../sm/keydb.c:1354
+#: sm/keydb.c:1354
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: ../sm/keydb.c:1406
+#: sm/keydb.c:1406
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem vid ytterligare sökning efter certifikat: %s\n"
 
-#: ../sm/keydb.c:1415
-#: ../sm/keydb.c:1507
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "fel vid hämtning av lagrade flaggor: %s\n"
 
-#: ../sm/keydb.c:1427
-#: ../sm/keydb.c:1518
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "fel vid lagring av flaggor: %s\n"
 
-#: ../sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr "Fel - "
 
-#: ../sm/misc.c:55
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
-msgstr "GPG_TTY har inte ställts in - använder kanske felaktigt standardvärde\n"
+msgstr ""
+"GPG_TTY har inte ställts in - använder kanske felaktigt standardvärde\n"
 
-#: ../sm/qualified.c:105
+#: sm/qualified.c:105
 #, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "ogiltigt formaterat fingeravtryck i \"%s\", rad %d\n"
 
-#: ../sm/qualified.c:123
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr "ogiltig landskod i \"%s\", rad %d\n"
 
-#: ../sm/qualified.c:200
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
 "\"%s\"\n"
-"This will create a qualified signature by law equated to a handwritten signature.\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
 "\n"
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 "Du är på väg att skapa en signatur med ditt certifikat:\n"
 "\"%s\"\n"
-"Det här kommer att skapa en kvalificerad signatur som kan likställas med en handskriven signatur.\n"
+"Det här kommer att skapa en kvalificerad signatur som kan likställas med en "
+"handskriven signatur.\n"
 "\n"
 "%s%sÄr du säker på att du vill göra det här?"
 
-#: ../sm/qualified.c:209
-#: ../sm/verify.c:612
-msgid "Note, that this software is not officially approved to create or verify such signatures.\n"
-msgstr "Observera att den här programvaran inte officiellt godkänts för att skapa eller validera sådana signaturer.\n"
+#: sm/qualified.c:209 sm/verify.c:612
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+"Observera att den här programvaran inte officiellt godkänts för att skapa "
+"eller validera sådana signaturer.\n"
 
-#: ../sm/qualified.c:276
+#: sm/qualified.c:276
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -8114,95 +7755,92 @@ msgid ""
 msgstr ""
 "Du är på väg att skapa en signatur med ditt certifikat:\n"
 "\"%s\"\n"
-"Observera att det här certifikatet INTE kommer att skapa en kvalificerad signatur!"
+"Observera att det här certifikatet INTE kommer att skapa en kvalificerad "
+"signatur!"
 
-#. case GCRY_MD_WHIRLPOOL: oid = "No OID yet"; break;
-#. We don't want to use MD5.
-#. No algorithm found in cert.
-#. Other algorithms.
-#: ../sm/sign.c:420
+#: sm/sign.c:420
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "hashalgoritm %d (%s) för signerare %d stöds inte; använder %s\n"
 
-#: ../sm/sign.c:433
+#: sm/sign.c:433
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "hashalgoritm som används för signerare %d: %s (%s)\n"
 
-#: ../sm/sign.c:483
+#: sm/sign.c:483
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
 
-#: ../sm/verify.c:447
+#: sm/verify.c:447
 msgid "Signature made "
 msgstr "Signatur gjord "
 
-#: ../sm/verify.c:451
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr "[datum inte angivet]"
 
-#: ../sm/verify.c:452
+#: sm/verify.c:452
 #, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr " använder certifikat-id 0x%08lX\n"
 
-#: ../sm/verify.c:470
-msgid "invalid signature: message digest attribute does not match computed one\n"
-msgstr "ogiltig signatur: meddelandesammandragsattribut matchar inte den beräknade\n"
+#: sm/verify.c:470
+msgid ""
+"invalid signature: message digest attribute does not match computed one\n"
+msgstr ""
+"ogiltig signatur: meddelandesammandragsattribut matchar inte den beräknade\n"
 
-#: ../sm/verify.c:590
+#: sm/verify.c:590
 msgid "Good signature from"
 msgstr "Korrekt signatur från"
 
-#: ../sm/verify.c:591
+#: sm/verify.c:591
 msgid "                aka"
 msgstr "      även känd som"
 
-#: ../sm/verify.c:609
+#: sm/verify.c:609
 msgid "This is a qualified signature\n"
 msgstr "Det här är en kvalificerad signatur\n"
 
-#: ../tools/gpg-connect-agent.c:67
-#: ../tools/gpgconf.c:78
-#: ../tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "tyst"
 
-#: ../tools/gpg-connect-agent.c:68
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr "skriv ut data hexkodat"
 
-#: ../tools/gpg-connect-agent.c:69
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr "avkoda mottagna datarader"
 
-#: ../tools/gpg-connect-agent.c:70
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
 
-#: ../tools/gpg-connect-agent.c:71
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr "kör Assuan-servern som angivits på kommandoraden"
 
-#: ../tools/gpg-connect-agent.c:73
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr "använd inte utökat anslutningsläge"
 
-#: ../tools/gpg-connect-agent.c:74
+#: tools/gpg-connect-agent.c:74
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FIL|kör kommandon från FIL vid uppstart"
 
-#: ../tools/gpg-connect-agent.c:75
+#: tools/gpg-connect-agent.c:75
 msgid "run /subst on startup"
 msgstr "kör /subst vid uppstart"
 
-#: ../tools/gpg-connect-agent.c:174
+#: tools/gpg-connect-agent.c:174
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Användning: gpg-connect-agent [flaggor] (-h för hjälp)"
 
-#: ../tools/gpg-connect-agent.c:177
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -8210,251 +7848,235 @@ msgstr ""
 "Syntax: gpg-connect-agent [flaggor]\n"
 "Anslut till en körande agent och skicka kommandon\n"
 
-#: ../tools/gpg-connect-agent.c:1189
+#: tools/gpg-connect-agent.c:1189
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "flaggan \"%s\" kräver ett program och valfria argument\n"
 
-#: ../tools/gpg-connect-agent.c:1198
+#: tools/gpg-connect-agent.c:1198
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "flaggan \"%s\" ignoreras på grund av \"%s\"\n"
 
-#: ../tools/gpg-connect-agent.c:1253
-#: ../tools/gpg-connect-agent.c:1717
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "mottagande rad misslyckades: %s\n"
 
-#: ../tools/gpg-connect-agent.c:1343
+#: tools/gpg-connect-agent.c:1343
 msgid "line too long - skipped\n"
 msgstr "raden är för lång - hoppades över\n"
 
-#: ../tools/gpg-connect-agent.c:1347
+#: tools/gpg-connect-agent.c:1347
 msgid "line shortened due to embedded Nul character\n"
 msgstr "rad nerkortad på grund av inbäddat Nul-tecken\n"
 
-#: ../tools/gpg-connect-agent.c:1691
+#: tools/gpg-connect-agent.c:1691
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "okänt kommando \"%s\"\n"
 
-#: ../tools/gpg-connect-agent.c:1709
+#: tools/gpg-connect-agent.c:1709
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sändande rad misslyckades: %s\n"
 
-#: ../tools/gpg-connect-agent.c:2065
+#: tools/gpg-connect-agent.c:2065
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "fel vid sändning av %s-kommando: %s\n"
 
-#: ../tools/gpg-connect-agent.c:2074
+#: tools/gpg-connect-agent.c:2074
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fel vid sändning av standardflaggor: %s\n"
 
-#: ../tools/gpgconf-comp.c:472
-#: ../tools/gpgconf-comp.c:576
-#: ../tools/gpgconf-comp.c:643
-#: ../tools/gpgconf-comp.c:711
-#: ../tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
 msgid "Options controlling the diagnostic output"
 msgstr "Flaggor som kontrollerar diagnosutdata"
 
-#: ../tools/gpgconf-comp.c:485
-#: ../tools/gpgconf-comp.c:589
-#: ../tools/gpgconf-comp.c:656
-#: ../tools/gpgconf-comp.c:724
-#: ../tools/gpgconf-comp.c:821
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
 msgid "Options controlling the configuration"
 msgstr "Flaggor som kontrollerar konfigurationen"
 
-#: ../tools/gpgconf-comp.c:495
-#: ../tools/gpgconf-comp.c:614
-#: ../tools/gpgconf-comp.c:672
-#: ../tools/gpgconf-comp.c:749
-#: ../tools/gpgconf-comp.c:828
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
 msgid "Options useful for debugging"
 msgstr "Flaggor användbara för felsökning"
 
-#: ../tools/gpgconf-comp.c:500
-#: ../tools/gpgconf-comp.c:619
-#: ../tools/gpgconf-comp.c:677
-#: ../tools/gpgconf-comp.c:754
-#: ../tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: ../tools/gpgconf-comp.c:508
-#: ../tools/gpgconf-comp.c:624
-#: ../tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
 msgid "Options controlling the security"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: ../tools/gpgconf-comp.c:515
+#: tools/gpgconf-comp.c:515
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|låt mellanlagrade SSH-nycklar gå ut efter N sekunder"
 
-#: ../tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:519
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
 
-#: ../tools/gpgconf-comp.c:523
+#: tools/gpgconf-comp.c:523
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|ställ in maximal livstid för SSH-nyckel till N sekunder"
 
-#: ../tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:537
 msgid "Options enforcing a passphrase policy"
 msgstr "Flaggor som tvingar igenom en lösenfraspolicy"
 
-#: ../tools/gpgconf-comp.c:540
+#: tools/gpgconf-comp.c:540
 msgid "do not allow to bypass the passphrase policy"
 msgstr "tillåt inte att gå förbi lösenfraspolicyn"
 
-#: ../tools/gpgconf-comp.c:544
+#: tools/gpgconf-comp.c:544
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|ställ in minimal nödvändig längd för nya lösenfraser till N"
 
-#: ../tools/gpgconf-comp.c:548
+#: tools/gpgconf-comp.c:548
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|kräv minst N icke-alfabetiska tecken för en ny lösenfras"
 
-#: ../tools/gpgconf-comp.c:552
+#: tools/gpgconf-comp.c:552
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FIL|kontrollera nya lösenfraser mot mönster i FIL"
 
-#: ../tools/gpgconf-comp.c:556
+#: tools/gpgconf-comp.c:556
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|låt mellanlagrad lösenfras gå ut efter N dagar"
 
-#: ../tools/gpgconf-comp.c:560
+#: tools/gpgconf-comp.c:560
 msgid "do not allow the reuse of old passphrases"
 msgstr "tillåt inte återanvändning av gamla lösenfraser"
 
-#: ../tools/gpgconf-comp.c:661
-#: ../tools/gpgconf-comp.c:729
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAMN|kryptera även till användaridentiteten NAMN"
 
-#: ../tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:664
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|ange e-postalias (ett eller flera)"
 
-#: ../tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:685
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration för nyckelservrar"
 
-#: ../tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:687
 msgid "|URL|use keyserver at URL"
 msgstr "|URL| använd nyckelservern på URL"
 
-#: ../tools/gpgconf-comp.c:690
+#: tools/gpgconf-comp.c:690
 msgid "allow PKA lookups (DNS requests)"
 msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
 
-#: ../tools/gpgconf-comp.c:693
+#: tools/gpgconf-comp.c:693
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MEKANISMER|använd MEKANISMER för att hitta nycklar efter e-postadress"
 
-#: ../tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:738
 msgid "disable all access to the dirmngr"
 msgstr "inaktivera all åtkomst till dirmngr"
 
-#: ../tools/gpgconf-comp.c:741
+#: tools/gpgconf-comp.c:741
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAMN|använd kodningen NAMN för PKCS#12-lösenfraser"
 
-#: ../tools/gpgconf-comp.c:767
+#: tools/gpgconf-comp.c:767
 msgid "do not check CRLs for root certificates"
 msgstr "kontrollera inte spärrlistor för rotcertifikat"
 
-#: ../tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:811
 msgid "Options controlling the format of the output"
 msgstr "Flaggor som kontrollerar formatet på utdata"
 
-#: ../tools/gpgconf-comp.c:847
+#: tools/gpgconf-comp.c:847
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
 
-#: ../tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:857
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration för HTTP-servrar"
 
-#: ../tools/gpgconf-comp.c:868
+#: tools/gpgconf-comp.c:868
 msgid "use system's HTTP proxy setting"
 msgstr "använd systemets HTTP-proxyinställningar"
 
-#: ../tools/gpgconf-comp.c:873
+#: tools/gpgconf-comp.c:873
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration av LDAP-servrar som ska användas"
 
-#: ../tools/gpgconf-comp.c:902
+#: tools/gpgconf-comp.c:902
 msgid "LDAP server list"
 msgstr "LDAP-serverlista"
 
-#: ../tools/gpgconf-comp.c:910
+#: tools/gpgconf-comp.c:910
 msgid "Configuration for OCSP"
 msgstr "Konfiguration för OCSP"
 
-#: ../tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Extern validering av komponenten %s misslyckades"
 
-#: ../tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr "Observera att gruppspecifikationer ignoreras\n"
 
-#: ../tools/gpgconf.c:60
+#: tools/gpgconf.c:60
 msgid "list all components"
 msgstr "lista alla komponenter"
 
-#: ../tools/gpgconf.c:61
+#: tools/gpgconf.c:61
 msgid "check all programs"
 msgstr "kontrollera alla program"
 
-#: ../tools/gpgconf.c:62
+#: tools/gpgconf.c:62
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENT|lista flaggor"
 
-#: ../tools/gpgconf.c:63
+#: tools/gpgconf.c:63
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENT|ändra flaggor"
 
-#: ../tools/gpgconf.c:64
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|check options"
 msgstr "|KOMPONENT|kontrollera flaggor"
 
-#: ../tools/gpgconf.c:66
+#: tools/gpgconf.c:66
 msgid "apply global default values"
 msgstr "tillämpa globala standardvärden"
 
-#: ../tools/gpgconf.c:68
+#: tools/gpgconf.c:68
 msgid "get the configuration directories for gpgconf"
 msgstr "hämta konfigurationskatalogerna för gpgconf"
 
-#: ../tools/gpgconf.c:70
+#: tools/gpgconf.c:70
 msgid "list global configuration file"
 msgstr "lista global konfigurationsfil"
 
-#: ../tools/gpgconf.c:72
+#: tools/gpgconf.c:72
 msgid "check global configuration file"
 msgstr "kontrollera global konfigurationsfil"
 
-#: ../tools/gpgconf.c:76
+#: tools/gpgconf.c:76
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: ../tools/gpgconf.c:80
+#: tools/gpgconf.c:80
 msgid "activate changes at runtime, if possible"
 msgstr "aktivera ändringar vid körtid, om möjligt"
 
-#: ../tools/gpgconf.c:102
+#: tools/gpgconf.c:102
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
 
-#: ../tools/gpgconf.c:105
+#: tools/gpgconf.c:105
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -8462,29 +8084,28 @@ msgstr ""
 "Syntax: gpgconf [flaggor]\n"
 "Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
 
-#: ../tools/gpgconf.c:210
-#: ../tools/gpgconf.c:250
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
 msgid "usage: gpgconf [options] "
 msgstr "användning: gpgconf [flaggor] "
 
-#: ../tools/gpgconf.c:212
+#: tools/gpgconf.c:212
 msgid "Need one component argument"
 msgstr "Behöver ett komponentargument"
 
-#: ../tools/gpgconf.c:221
+#: tools/gpgconf.c:221
 msgid "Component not found"
 msgstr "Komponenten hittades inte"
 
-#: ../tools/gpgconf.c:252
+#: tools/gpgconf.c:252
 msgid "No argument allowed"
 msgstr "Inget argument tillåts"
 
-#: ../tools/no-libgcrypt.c:30
+#: tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
 
-#: ../tools/symcryptrun.c:152
+#: tools/symcryptrun.c:152
 msgid ""
 "@\n"
 "Commands:\n"
@@ -8494,171 +8115,171 @@ msgstr ""
 "Kommandon:\n"
 " "
 
-#: ../tools/symcryptrun.c:154
+#: tools/symcryptrun.c:154
 msgid "decryption modus"
 msgstr "dekrypteringsmodus"
 
-#: ../tools/symcryptrun.c:155
+#: tools/symcryptrun.c:155
 msgid "encryption modus"
 msgstr "krypteringsmodus"
 
-#: ../tools/symcryptrun.c:159
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr "verktygsklass (confucius)"
 
-#: ../tools/symcryptrun.c:160
+#: tools/symcryptrun.c:160
 msgid "program filename"
 msgstr "programfilnamn"
 
-#: ../tools/symcryptrun.c:162
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr "hemlig nyckelfil (krävs)"
 
-#: ../tools/symcryptrun.c:163
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr "filnamn för inmatning (standardvärde är standard in)"
 
-#: ../tools/symcryptrun.c:207
+#: tools/symcryptrun.c:207
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Användning: symcryptrun [flaggor] (-h för hjälp)"
 
-#: ../tools/symcryptrun.c:210
+#: tools/symcryptrun.c:210
 msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE [options...] COMMAND [inputfile]\n"
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
-"Syntax: symcryptrun --class KLASS --program PROGRAM --keyfile NYCKELFIL [flaggor...] KOMMANDO [inmatningsfil]\n"
+"Syntax: symcryptrun --class KLASS --program PROGRAM --keyfile NYCKELFIL "
+"[flaggor...] KOMMANDO [inmatningsfil]\n"
 "Anropa ett enkelt symmetriskt krypteringsverktyg\n"
 
-#: ../tools/symcryptrun.c:279
+#: tools/symcryptrun.c:279
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s på %s avbröts med status %i\n"
 
-#: ../tools/symcryptrun.c:286
+#: tools/symcryptrun.c:286
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%s på %s misslyckades med status %i\n"
 
-#: ../tools/symcryptrun.c:312
+#: tools/symcryptrun.c:312
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "kan inte skapa temporärkatalogen \"%s\": %s\n"
 
-#: ../tools/symcryptrun.c:352
-#: ../tools/symcryptrun.c:369
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "kunde inte öppna %s för skrivning: %s\n"
 
-#: ../tools/symcryptrun.c:380
+#: tools/symcryptrun.c:380
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "fel vid skrivning till %s: %s\n"
 
-#: ../tools/symcryptrun.c:387
+#: tools/symcryptrun.c:387
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "fel vid läsning från %s: %s\n"
 
-#: ../tools/symcryptrun.c:394
-#: ../tools/symcryptrun.c:401
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "fel vid stängning av %s: %s\n"
 
-#: ../tools/symcryptrun.c:486
+#: tools/symcryptrun.c:486
 msgid "no --program option provided\n"
 msgstr "flaggan --program angavs inte\n"
 
-#: ../tools/symcryptrun.c:492
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "endast --decrypt och --encrypt stöds\n"
 
-#: ../tools/symcryptrun.c:498
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr "flaggan --keyfile angavs inte\n"
 
-#: ../tools/symcryptrun.c:509
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr "kan inte allokera argumentvektor\n"
 
-#: ../tools/symcryptrun.c:527
+#: tools/symcryptrun.c:527
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "kunde inte skapa rör: %s\n"
 
-#: ../tools/symcryptrun.c:534
+#: tools/symcryptrun.c:534
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "kunde inte skapa pty: %s\n"
 
-#: ../tools/symcryptrun.c:550
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "kunde inte grena process: %s\n"
 
-#: ../tools/symcryptrun.c:578
+#: tools/symcryptrun.c:578
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "execv misslyckades: %s\n"
 
-#: ../tools/symcryptrun.c:607
+#: tools/symcryptrun.c:607
 #, c-format
 msgid "select failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: ../tools/symcryptrun.c:624
+#: tools/symcryptrun.c:624
 #, c-format
 msgid "read failed: %s\n"
 msgstr "läsning misslyckades: %s\n"
 
-#: ../tools/symcryptrun.c:676
+#: tools/symcryptrun.c:676
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "pty-läsning misslyckades: %s\n"
 
-#: ../tools/symcryptrun.c:728
+#: tools/symcryptrun.c:728
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "waitpid misslyckades: %s\n"
 
-#: ../tools/symcryptrun.c:742
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "barnprocess avbröts med status %i\n"
 
-#: ../tools/symcryptrun.c:797
+#: tools/symcryptrun.c:797
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "kan inte allokera infilssträng: %s\n"
 
-#: ../tools/symcryptrun.c:810
+#: tools/symcryptrun.c:810
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "kan inte allokera utfilssträng: %s\n"
 
-#: ../tools/symcryptrun.c:985
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "antingen %s eller %s måste anges\n"
 
-#: ../tools/symcryptrun.c:1012
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr "ingen klass tillhandahölls\n"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: ../tools/symcryptrun.c:1021
+#: tools/symcryptrun.c:1021
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "klassen %s stöds inte\n"
 
-#: ../tools/gpg-check-pattern.c:145
+#: tools/gpg-check-pattern.c:145
 msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 msgstr "Användning: gpg-check-pattern [flaggor] mönsterfil (-h för hjälp)\n"
 
-#: ../tools/gpg-check-pattern.c:148
+#: tools/gpg-check-pattern.c:148
 msgid ""
 "Syntax: gpg-check-pattern [options] patternfile\n"
 "Check a passphrase given on stdin against the patternfile\n"
@@ -8677,6 +8298,7 @@ msgstr ""
 #~ "exporteras till någon tredje part. Vi behöver det för att implementera\n"
 #~ "\"Web of trust\". Det har inget att göra med det (implicit skapade)\n"
 #~ "nätet av certifikat."
+
 #~ msgid ""
 #~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 #~ "ultimately trusted - those are usually the keys for which you have\n"
@@ -8688,12 +8310,15 @@ msgstr ""
 #~ "- det är vanligen de nycklar som du disponerar den hemliga nyckeln för.\n"
 #~ "Svara  \"ja\" för att markera att du litar förbehållslöst på denna "
 #~ "nyckel.\n"
+
 #~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 #~ msgstr "Om du vill använda denna otillförlitliga nyckel ändå, svara \"ja\"."
+
 #~ msgid ""
 #~ "Enter the user ID of the addressee to whom you want to send the message."
 #~ msgstr ""
 #~ "Ange användaridentiteten för den adressat du vill skicka meddelandet till."
+
 #~ msgid ""
 #~ "Select the algorithm to use.\n"
 #~ "\n"
@@ -8717,6 +8342,7 @@ msgstr ""
 #~ "\n"
 #~ "Första (primär) nyckel måste alltid vara en nyckel som är kapabel att "
 #~ "signera."
+
 #~ msgid ""
 #~ "In general it is not a good idea to use the same key for signing and\n"
 #~ "encryption.  This algorithm should only be used in certain domains.\n"
@@ -8725,10 +8351,13 @@ msgstr ""
 #~ "Som regel är det ingen bra idé att använda samma nyckel för signering\n"
 #~ "och kryptering. Denna algoritm ska endast användas inom särskilda\n"
 #~ "områden. Rådgör med din egen säkerhetsexpert först!"
+
 #~ msgid "Enter the size of the key"
 #~ msgstr "Ange storleken på nyckeln"
+
 #~ msgid "Answer \"yes\" or \"no\""
 #~ msgstr "Svara \"ja\" eller \"nej\""
+
 #~ msgid ""
 #~ "Enter the required value as shown in the prompt.\n"
 #~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -8739,12 +8368,16 @@ msgstr ""
 #~ "Det är möjligt att ange ett ISO-datum (ÅÅÅÅ-MM-DD) men du kommer\n"
 #~ "inte att få något vettigt felmeddelande - istället kommer systemet\n"
 #~ "att försöka tolka det angivna värdet som ett intervall."
+
 #~ msgid "Enter the name of the key holder"
 #~ msgstr "Ange namnet på nyckelns ägare"
+
 #~ msgid "please enter an optional but highly suggested email address"
 #~ msgstr "ange en e-postadress. Detta är frivilligt, men rekommenderas varmt"
+
 #~ msgid "Please enter an optional comment"
 #~ msgstr "Ange en kommentar (frivilligt)"
+
 #~ msgid ""
 #~ "N  to change the name.\n"
 #~ "C  to change the comment.\n"
@@ -8757,10 +8390,12 @@ msgstr ""
 #~ "E  för att ändra e-postadressen.\n"
 #~ "O  för att fortsätta med nyckelgenerering.\n"
 #~ "Q  för att avsluta nyckelgenereringen."
+
 #~ msgid ""
 #~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 #~ msgstr ""
 #~ "Svara \"ja\" (eller bara \"j\") om du vill generera denna undernyckel."
+
 #~ msgid ""
 #~ "When you sign a user ID on a key, you should first verify that the key\n"
 #~ "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -8845,4 +8480,3 @@ msgstr ""
 #~ "betyder när du signerar andras nycklar.\n"
 #~ "\n"
 #~ "Om du inte vet vad du ska svara, så svara \"0\"."
-
diff --git a/po/tr.po b/po/tr.po
index 34d6df82a..79a4ec99d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.9.94\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2006-11-04 03:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -91,8 +91,8 @@ msgstr "Anahtar Parolası"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -102,10 +102,10 @@ msgstr "\"%s\" oluşturulamıyor: %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1102,7 +1102,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "bu önceden betik kipinde yapılamaz\n"
 
@@ -3282,19 +3282,19 @@ msgstr ""
 "Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
 "değiştirilecek bir anahtar parolası yok.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
@@ -3311,7 +3311,7 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
@@ -4107,12 +4107,12 @@ msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
@@ -4252,7 +4252,7 @@ msgstr "İstenen anahtar uzunluğu: %u bit\n"
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4268,7 +4268,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4284,38 +4284,38 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "İmza ne kadar geçerli olacak? (%s) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 msgid "Key does not expire at all\n"
 msgstr "Anahtar hep geçerli olacak\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 msgid "Signature does not expire at all\n"
 msgstr "İmza hep geçerli olacak\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Anahtarın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "İmzanın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4323,18 +4323,18 @@ msgstr ""
 "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
 "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 msgid "Is this correct? (y/N) "
 msgstr "Bu doğru mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4350,44 +4350,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4398,7 +4398,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
@@ -4414,24 +4414,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4439,12 +4439,12 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4456,7 +4456,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4469,50 +4469,50 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtarlık yok: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtarlık yok: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4520,19 +4520,19 @@ msgstr ""
 "Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
 "\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4540,26 +4540,26 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "anahtarın kart üzerinde saklanması başarısız: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
@@ -6021,12 +6021,12 @@ msgstr "`%s' için okuma hatası: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "güvence veritabanı %lu kaydı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "güvence veritabanı %lu kaydı: yazma başarısız (n=%d): %s\n"
@@ -6070,82 +6070,82 @@ msgstr "%s: geçersiz güvence veritabanı oluşturuldu\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: güvence veritabanı oluşturuldu\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "BİLGİ: güvence veritabanına yazılamıyor\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: güvence veritabanı geçersiz\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: çittirim tablosu oluşturulamadı: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: sürüm kaydının güncellenmesinde hata: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: sürüm kaydının okunmasında hata: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: sürüm kaydının yazılmasında hata: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "güvence veritabanı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "güvence veritabanı: okuma başarısız (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bir güvence veritabanı dosyası değil\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: %lu kayıt numarası ile sürüm kaydı\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: dosya sürümü %d geçersiz\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: serbest kaydı okuma hatası: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: dizin kaydını yazma hatası: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kayıt sıfırlama başarısız: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kayıt ekleme başarısız: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
@@ -6495,13 +6495,13 @@ msgstr ""
 "Sözdizimi: kbxutil [seçenekler] [dosyalar]\n"
 "Anahtar kutusu verisini listeler, ithal ve ihraç eder\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 #, fuzzy
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN eylemcisi hata döndürdü: %s\n"
@@ -6513,99 +6513,104 @@ msgstr "BoşPIN henüz değişmedi\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr "|N|Yeni PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "parmakizinin saklanması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "genel anahtar okuması başarısız: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr "yanıt genel anahtar verisi içermiyor\n"
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr "yanıt RSA modülü içermiyor\n"
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Lütfen PIN'i giriniz%%0A[yapılan imza: %lu]"
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Lütfen PIN'i giriniz%%0A[yapılan imza: %lu]"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "kart kalıcı olarak kilitlenmeden önce %d Yönetici PIN kalmasına çalışılıyor\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
@@ -6613,98 +6618,98 @@ msgstr "bir okuyucu tuştakımı kullanılmaz"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr "|A|Yönetici PIN'i"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Yeni Yönetici PIN'i"
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 msgid "error reading application data\n"
 msgstr "uygulama verisi okunurken hata\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 msgid "error reading fingerprint DO\n"
 msgstr "parmakizi DO okunurken hata\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 msgid "key already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr "mevcut anahtar konulacak\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 msgid "generating new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr "oluşturum zaman damgası kayıp\n"
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modülü ya eksik ya da %d bitlik değil\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA genel üstel sayısı ya eksik ya da %d bitten büyük\n"
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA asal sayısı %s ya eksik la da %d bitlik değil\n"
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 msgid "generating key failed\n"
 msgstr "anahtar üretimi başarısızlığa uğradı\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kart %s özet algoritmasını desteklemiyor\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "Yönetici PIN'inin doğrulanması bu komut yüzünden şimdilik yasaktır\n"
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@ -7645,7 +7650,7 @@ msgstr "saklanmış bayraklar alınırken hata: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "bayraklar saklanırken hata: %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 #, fuzzy
 msgid "Error - "
 msgstr "[Hata - Adsız]"
@@ -7968,12 +7973,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr "OCSP için yapılandırma"
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c1b6e69ac..f3262bf81 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -98,8 +98,8 @@ msgstr "错误的密码"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -109,10 +109,10 @@ msgstr "无法建立‘%s’：%s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1117,7 +1117,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
@@ -3244,19 +3244,19 @@ msgstr "签名时失败： %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
@@ -3273,7 +3273,7 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
@@ -4021,12 +4021,12 @@ msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签名\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
@@ -4164,7 +4164,7 @@ msgstr "您所要求的密钥尺寸是 %u 位\n"
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4180,7 +4180,7 @@ msgstr ""
 "      <n>m = 密钥在 n 月后过期\n"
 "      <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4196,38 +4196,38 @@ msgstr ""
 "      <n>m = 签名在 n 月后过期\n"
 "      <n>y = 签名在 n 年后过期\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签名的有效期限是多久？(%s) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "无效的数值\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 msgid "Key does not expire at all\n"
 msgstr "密钥永远不会过期\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 msgid "Signature does not expire at all\n"
 msgstr "签名永远不会过期\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签名于 %s 过期\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4235,18 +4235,18 @@ msgstr ""
 "您的系统无法显示 2038 年以后的日期。\n"
 "不过，它可以正确处理 2106 年之前的年份。\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 msgid "Is this correct? (y/N) "
 msgstr "以上正确吗？(y/n)"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4262,44 +4262,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "真实姓名："
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "电子邮件地址："
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "注释："
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4310,7 +4310,7 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
@@ -4325,23 +4325,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4349,12 +4349,12 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4366,7 +4366,7 @@ msgstr ""
 "再次执行这个程序，并且使用“--edit-key”选项即可。\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4376,50 +4376,50 @@ msgstr ""
 "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
 "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并经签名。\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4427,42 +4427,42 @@ msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "向卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：卡密钥的备份已保存到‘%s’\n"
@@ -5873,12 +5873,12 @@ msgstr "读取‘%s’错误：%s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任度数据库：同步失败：%s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任度数据库记录 %lu：lseek 失败：%s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任度数据库记录 %lu：write 失败 (n=%d): %s\n"
@@ -5922,82 +5922,82 @@ msgstr "%s：建立了无效的信任度数据库\n"
 msgid "%s: trustdb created\n"
 msgstr "%s：建立了信任度数据库\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "注意：信任度数据库不可写入\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s：无效的信任度数据库\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s：建立散列表失败：%s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s：更新版本记录时出错： %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s：读取版本记录时出错： %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s：写入版本记录时出错：%s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任度数据库：lseek 失败：%s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任度数据库：read 失败(n=%d)：%s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s：不是一个信任度数据库文件\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s：记录编号为%lu的版本记录\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s：无效的文件版本%d\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s：读取自由记录时出错：%s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s：写入目录记录时出错：%s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s：记录归零时失败：%s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s：附加记录时失败：%s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "信任度数据库已损坏；请执行“gpg --fix-trustdb”。\n"
 
@@ -6345,12 +6345,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
@@ -6362,98 +6362,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr "新的 PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "无法存储创建日期：%s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr "响应未包含公钥数据\n"
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应未包含 RSA 余数\n"
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应未包含 RSA 公钥指数\n"
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr "尚未配置管理员命令的权限\n"
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
@@ -6461,98 +6466,98 @@ msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr "|A|管理员 PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新的管理员 PIN"
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 D0 出错\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替换\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 msgid "generating new key\n"
 msgstr "生成新密钥\n"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr "缺少创建时间戳\n"
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 余数缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d 位\n"
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "无法存储密钥：%s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr "请稍候，正在生成密钥……\n"
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 msgid "generating key failed\n"
 msgstr "生成密钥失败\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "密钥已生成(耗时 %d 秒)\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡不支持散列算法 %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签名：%lu\n"
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
@@ -7525,7 +7530,7 @@ msgstr "获取新 PIN 时出错：%s\n"
 msgid "error storing flags: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -7838,12 +7843,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 566a4f8c5..6adf44438 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2008-03-26 22:35+0800\n"
 "Last-Translator: Jedi Lin <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -94,8 +94,8 @@ msgstr "密語"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -105,10 +105,10 @@ msgstr "無法建立 `%s': %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1071,7 +1071,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
@@ -3199,19 +3199,19 @@ msgstr "簽署時失敗: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "這把金鑰未被保護.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分無法取用.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "金鑰已保護.\n"
 
@@ -3228,7 +3228,7 @@ msgstr ""
 "請輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "前後兩次輸入的密語不一致; 請再試一次"
 
@@ -3978,12 +3978,12 @@ msgid "writing key binding signature\n"
 msgstr "寫入附鑰簽章中\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
@@ -4121,7 +4121,7 @@ msgstr "你所要求的金鑰尺寸是 %u 位元\n"
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4137,7 +4137,7 @@ msgstr ""
 "      <n>m = 金鑰在 n 月後會到期\n"
 "      <n>y = 金鑰在 n 年後會到期\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4153,38 +4153,38 @@ msgstr ""
 "      <n>m = 簽章在 n 月後會到期\n"
 "      <n>y = 簽章在 n 年後會到期\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期限是多久? (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期限是多久? (%s) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 msgid "Key does not expire at all\n"
 msgstr "金鑰完全不會過期\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 msgid "Signature does not expire at all\n"
 msgstr "簽章完全不會過期\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "金鑰將會在 %s 到期\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "簽章將會在 %s 到期.\n"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4192,18 +4192,18 @@ msgstr ""
 "你的系統無法顯示 2038 年以後的日期.\n"
 "不過, 它可以正確處理直到 2106 年之前的年份.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4218,44 +4218,44 @@ msgstr ""
 "    \"Ke-Huan Lin (Jedi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "真實姓名: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "姓名含有無效的字符\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用數字開頭\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五個字符長\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "電子郵件地址: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "註釋含有無效的字符\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "你正在使用 `%s' 字元集.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4266,7 +4266,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
 
@@ -4281,23 +4281,23 @@ msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4305,12 +4305,12 @@ msgstr ""
 "你需要一個密語來保護你的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4322,7 +4322,7 @@ msgstr ""
 "僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4333,50 +4333,50 @@ msgstr ""
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "金鑰產生已取消.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在寫入公鑰至 `%s'\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在寫入私鑰至 `%s'\n"
 
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可寫入的私鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 `%s' 時出錯: %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "寫入私鑰鑰匙圈 `%s' 時出錯: %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和私鑰已建立及簽署.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4384,42 +4384,42 @@ msgstr ""
 "請注意這把金鑰不能用於加密.  也許你會想藉由 \"--edit-key\" 指令\n"
 "來產生加密用的子鑰.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "儲存金鑰到卡片上時失敗: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
@@ -5835,12 +5835,12 @@ msgstr "讀取 `%s' 錯誤: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任資料庫: 同步化失敗: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
@@ -5884,82 +5884,82 @@ msgstr "%s: 建立了無效的信任資料庫\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: 建立了信任資料庫\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "請注意: 信任資料庫不可寫入\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: 無效的信任資料庫\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: 建立雜湊表失敗: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: 更新版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: 讀取版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: 寫入版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任資料庫: 本機搜尋失敗: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: 不是一個信任資料庫檔案\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: 無效的檔案版本 %d\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: 讀取可用空間記錄時出錯: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: 寫入目錄記錄時出錯: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: 記錄歸零失敗: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: 附加記錄失敗: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "信任資料庫已損毀; 請執行 \"gpg --fix-trustdb\".\n"
 
@@ -6297,12 +6297,12 @@ msgstr ""
 "語法: kbxutil [選項] [檔案]\n"
 "列出, 匯出, 匯入金鑰鑰匙盒資料\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||請在讀卡機鍵盤上輸入你的 PIN"
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "收回 PIN 時傳回錯誤: %s\n"
@@ -6314,196 +6314,201 @@ msgstr "NullPIN 還沒有變更過\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr "|N|新增 PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "取得新的 PIN 時出錯: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存放創生日期失敗: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包含公鑰資料\n"
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||請在讀卡機鍵盤上輸入你的 PIN%%0A[簽署完成: %lu]"
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "用於 CHV%d 的 PIN 太短; 長度最少要有 %d\n"
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV%d 失敗: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr "管理者指令存取權限尚未組態\n"
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr "卡片永久鎖定了!!\n"
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d 管理者 PIN 試圖在卡片永久鎖定前遺留下來\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "|A|請在讀卡機鍵盤上輸入管理者 PIN%%0A[剩餘嘗試次數: %d]"
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "|A|請在讀卡機鍵盤上輸入管理者 PIN"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr "|A|管理者 PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新增管理者 PIN"
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 msgid "error reading application data\n"
 msgstr "讀取應用程式資料時出錯\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 msgid "error reading fingerprint DO\n"
 msgstr "讀取指紋 DO 時出錯\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 msgid "key already exists\n"
 msgstr "金鑰已存在\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr "既有的金鑰將被取代\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 msgid "generating new key\n"
 msgstr "正在產生新的金鑰\n"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr "缺漏創生時間戳印\n"
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr "正在產生金鑰中, 請稍候 ...\n"
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 msgid "generating key failed\n"
 msgstr "產生金鑰時失敗\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "金鑰產生完畢 (%d 秒)\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr "卡片上的指紋與所要求的那個並不吻合\n"
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡片不支援 %s 摘要演算法\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@ -7419,7 +7424,7 @@ msgstr "取得已存放的旗標時出錯: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "存放旗標時出錯: %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 #, fuzzy
 msgid "Error - "
 msgstr "[錯誤 - 沒有名稱]"
@@ -7731,12 +7736,12 @@ msgstr "LDAP 伺服器清單"
 msgid "Configuration for OCSP"
 msgstr "OCSP 組態"
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr "請注意群組規格已忽略\n"
 
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 0b29330c4..159a7342e 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-03  Werner Koch  <[email protected]>
+
+	* sign.c (MY_GCRY_MD_SHA224): New, so that we don't need libgcrypt
+	1.2. 
+
 2008-08-13  Werner Koch  <[email protected]>
 
 	* keylist.c (list_cert_colon): Print 'f' for validated certs.
diff --git a/sm/sign.c b/sm/sign.c
index fadd66469..c87382ee8 100644
--- a/sm/sign.c
+++ b/sm/sign.c
@@ -33,6 +33,9 @@
 #include "keydb.h"
 #include "i18n.h"
 
+/* Remove this if libgcrypt 1.4 is required. */
+#define MY_GCRY_MD_SHA224  11
+
 
 static void
 hash_data (int fd, gcry_md_hd_t md)
@@ -408,7 +411,7 @@ gpgsm_sign (ctrl_t ctrl, certlist_t signerlist,
         {
         case GCRY_MD_SHA1:   oid = "1.3.14.3.2.26"; break;
         case GCRY_MD_RMD160: oid = "1.3.36.3.2.1"; break;
-        case GCRY_MD_SHA224: oid = "2.16.840.1.101.3.4.2.4"; break;
+        case MY_GCRY_MD_SHA224: oid = "2.16.840.1.101.3.4.2.4"; break;
         case GCRY_MD_SHA256: oid = "2.16.840.1.101.3.4.2.1"; break;
         case GCRY_MD_SHA384: oid = "2.16.840.1.101.3.4.2.2"; break;
         case GCRY_MD_SHA512: oid = "2.16.840.1.101.3.4.2.3"; break;
diff --git a/tools/mk-tdata.c b/tools/mk-tdata.c
index 833875d28..9328dc12a 100644
--- a/tools/mk-tdata.c
+++ b/tools/mk-tdata.c
@@ -10,7 +10,9 @@
  * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>